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 /lib/Plugins/SQLite3.cpp | |
parent | 04d69684f58d851ab604b2ed5eeb04f373efd4d8 (diff) | |
parent | b348085ac9f3d4a7ded81026bffa962a065bdf97 (diff) | |
download | abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.gz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.xz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.zip |
resolve conflict
Diffstat (limited to 'lib/Plugins/SQLite3.cpp')
-rw-r--r-- | lib/Plugins/SQLite3.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/Plugins/SQLite3.cpp b/lib/Plugins/SQLite3.cpp index ffcf05f..7f90c46 100644 --- a/lib/Plugins/SQLite3.cpp +++ b/lib/Plugins/SQLite3.cpp @@ -21,11 +21,9 @@ #include <sqlite3.h> #include <string> -#include <stdlib.h> +#include "abrtlib.h" #include "SQLite3.h" #include "ABRTException.h" -#include <limits.h> -#include <abrtlib.h> using namespace std; |