Added DB2 backend

SOCI · Feb 5, 2013 · 4e208c0 · 4e208c0
1 parent b6cf700
commit 4e208c0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/src/backends/db2/soci-db2.h b/src/backends/db2/soci-db2.h
@@ -28,13 +28,10 @@
 
 #include <cstddef>
 #include <string>
-<<<<<<< HEAD
 #include <vector>
 #include <iostream>
 #include <sstream>
 #include <cstring>
-=======
->>>>>>> Ignored ide files
 
 #include <sqlcli1.h>
 

diff --git a/src/backends/db2/test/test-db2.cpp b/src/backends/db2/test/test-db2.cpp
@@ -6,11 +6,7 @@
 //
 
 #include "soci.h"
-<<<<<<< HEAD
 #include "soci-db2.h"
-=======
-#include "soci-empty.h"
->>>>>>> Ignored ide files
 #include <iostream>
 #include <string>
 #include <cassert>
@@ -20,11 +16,7 @@
 using namespace soci;
 
 std::string connectString;
-<<<<<<< HEAD
 backend_factory const &backEnd = *soci::factory_db2();
-=======
-backend_factory const &backEnd = *soci::factory_empty();
->>>>>>> Ignored ide files
 
 
 // NOTE: