Rebase

Author: tharun571

test/test_interpreter.cpp

@@ -19,12 +19,9 @@
 #include "../src/xmagics/os.hpp"
 #include "../src/xinspect.hpp"
 
-<<<<<<< HEAD
-#include <iostream>
 
-=======
+#include <iostream>
 #include <pugixml.hpp>
->>>>>>> 28d397a (Update tags definition, add tests for xmanager, xinspect)
 #include <fstream>
 #if defined(__GNUC__) && !defined(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)
     #include <sys/wait.h>
@@ -682,9 +679,7 @@ TEST_SUITE("xmagics_apply"){
         manager.apply("%dummy", kernel_res);
         REQUIRE(kernel_res["status"] == "error");
     } 
-<<<<<<< HEAD
 
-<<<<<<< HEAD
     TEST_CASE("good_status_line") {
 
         xcpp::xpreamble_manager preamble_manager;
@@ -726,7 +721,6 @@ TEST_SUITE("xmagics_apply"){
         REQUIRE(redirect.getCaptured() == "UsageError: %%test is a cell magic, but the cell body is empty.\n"
                     "If you only intend to display %%test help, please use a double line break to fill in the cell body.\n");
     }
-=======
     TEST_CASE("cell magic with empty cell body") {
         xcpp::xmagics_manager manager;
 
@@ -741,10 +735,6 @@ TEST_SUITE("xmagics_apply"){
                       "If you only intend to display %%test help, please use a double line break to fill in the cell body.\n");
 
     }
-
->>>>>>> 28d397a (Update tags definition, add tests for xmanager, xinspect)
-=======
->>>>>>> e833faf (Remove test for xmagics)
 }
 
 #if defined(__GNUC__) && !defined(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)