From 4e208c0721cfc90e3e77ed81c84d70d26a5ca73f Mon Sep 17 00:00:00 2001
From: Denis Chapligin <chollya@satgate.net>
Date: Wed, 9 Feb 2011 16:06:36 +0200
Subject: [PATCH] Added DB2 backend

---
 src/backends/db2/soci-db2.h        | 3 ---
 src/backends/db2/test/test-db2.cpp | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/src/backends/db2/soci-db2.h b/src/backends/db2/soci-db2.h
index 0abb626a5..834626c32 100644
--- 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
index 3d0a582f4..a54914f6a 100644
--- 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: