diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
| commit | 8ddcb9404d65bc6b09910099988fe6a0f33fe250 (patch) | |
| tree | 2214c48219c8f3cf1b4110113467fa92d38bfa84 /src/Daemon/Daemon.cpp | |
| parent | 04d69684f58d851ab604b2ed5eeb04f373efd4d8 (diff) | |
| parent | b348085ac9f3d4a7ded81026bffa962a065bdf97 (diff) | |
| download | abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.gz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.xz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.zip | |
resolve conflict
Diffstat (limited to 'src/Daemon/Daemon.cpp')
| -rw-r--r-- | src/Daemon/Daemon.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index a2970af..dc547af 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -21,7 +21,6 @@ #include <pthread.h> #include <resolv.h> /* res_init */ #include <string> -#include <limits.h> #include <sys/inotify.h> #include <xmlrpc-c/base.h> #include <xmlrpc-c/client.h> |