Merge conficts resolved

2017-02-13 09:23:34 +01:00
parent 9adf5699d9 6320784687
commit c36883003a
2 changed files with 0 additions and 2 deletions
--- a/include/query/i_plan_cpu.hpp
+++ b/include/query/i_plan_cpu.hpp
@@ -8,7 +8,6 @@ template<typename Stream>
 class IPlanCPU {
 public:
  virtual bool run(GraphDbAccessor &db_accessor, TypedValueStore<>& args, Stream &stream) = 0;
-
  virtual ~IPlanCPU() {}
 };

--- a/include/query/strip/stripped.hpp
+++ b/include/query/strip/stripped.hpp
@@ -1,7 +1,6 @@
 #pragma once

 #include <vector>
-
 #include "storage/typed_value_store.hpp"

 /*