From 77375a7b64b0e264c7318220a59738e841a1c670 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Sun, 5 Nov 2006 05:11:44 +0000 Subject: Cleaned up a couple of conflicts. --- src/connectionmonitor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/connectionmonitor.cpp') diff --git a/src/connectionmonitor.cpp b/src/connectionmonitor.cpp index 14e46f7..4f90ee6 100644 --- a/src/connectionmonitor.cpp +++ b/src/connectionmonitor.cpp @@ -1,6 +1,10 @@ #include "connectionmonitor.h" -ConnectionMonitor::ConnectionMonitor(){ +ConnectionMonitor::ConnectionMonitor() +{ } -ConnectionMonitor::~ConnectionMonitor(){ + +ConnectionMonitor::~ConnectionMonitor() +{ } + -- cgit v1.2.3