From 37f38368258aaea49588eaa0881c5265571bf127 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 3 Aug 2021 20:00:20 +0200
Subject: [PATCH] FIX tests
---
test/test_transaction.cpp | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index c7dbf81..5865e62 100644
--- a/test/test_transaction.cpp
+++ b/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
--
GitLab