Remove test for xmagics

tharun571 · tharun571 · commit 4a3ab6fec836 · 2024-06-01T12:03:23.000+05:30
diff --git a/test/test_interpreter.cpp b/test/test_interpreter.cpp
@@ -682,6 +682,7 @@ TEST_SUITE("xmagics_apply"){
         manager.apply("%dummy", kernel_res);
         REQUIRE(kernel_res["status"] == "error");
     } 
+<<<<<<< HEAD
 
 <<<<<<< HEAD
     TEST_CASE("good_status_line") {
@@ -742,6 +743,8 @@ TEST_SUITE("xmagics_apply"){
     }
 
 >>>>>>> 28d397a (Update tags definition, add tests for xmanager, xinspect)
+=======
+>>>>>>> e833faf (Remove test for xmagics)
 }
 
 #if defined(__GNUC__) && !defined(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)

Original file line number	Diff line number	Diff line change
`@@ -682,6 +682,7 @@ TEST_SUITE("xmagics_apply"){`
`682`	`682`	`manager.apply("%dummy", kernel_res);`
`683`	`683`	`REQUIRE(kernel_res["status"] == "error");`
`684`	`684`	`}`
	`685`	`+<<<<<<< HEAD`
`685`	`686`
`686`	`687`	`<<<<<<< HEAD`
`687`	`688`	`TEST_CASE("good_status_line") {`
`@@ -742,6 +743,8 @@ TEST_SUITE("xmagics_apply"){`
`742`	`743`	`}`
`743`	`744`
`744`	`745`	`>>>>>>> 28d397a (Update tags definition, add tests for xmanager, xinspect)`
	`746`	`+=======`
	`747`	`+>>>>>>> e833faf (Remove test for xmagics)`
`745`	`748`	`}`
`746`	`749`
`747`	`750`	`#if defined(__GNUC__) && !defined(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)`