FIX tests

test/test_transaction.cpp

@@ -27,17 +27,10 @@
 #include "gtest/gtest-message.h"       // for Message
 #include "gtest/gtest-test-part.h"     // for TestPartResult, SuiteApiResolver
 #include "gtest/gtest_pred_impl.h"     // for Test, EXPECT_EQ, AssertionResult
-<<<<<<< HEAD
-#include <iostream>
-#include <memory> // for unique_ptr, allocator, __shar...
-#include <string> // for string
-#include <vector> // for vector
-=======
 #include <iostream>                    // for endl, basic_ostream, cout
 #include <memory>                      // for unique_ptr, allocator, __shar...
 #include <string>                      // for string
->>>>>>> f-insert
-
+#include <vector>                      // for vector
 namespace caosdb::transaction {
 using caosdb::entity::Entity;
 using caosdb::entity::MessageCode;
@@ -272,5 +265,4 @@ TEST(test_transaction, test_multi_retrieve) {
             MessageCode::ENTITY_DOES_NOT_EXIST);
 }
 
-
 } // namespace caosdb::transaction