43700a7571ce086db8b241e0ca0fc2745a431565

diff --git a/examples/simuc/src/main.cpp b/examples/simuc/src/main.cpp
index f7fde5789e248908fae70fcb6a23f7ea29871ccb..88167a4e924369daafeda3d2b2ae229dc7db110d 100644 (file)
--- a/examples/simuc/src/main.cpp
+++ b/examples/simuc/src/main.cpp
@@ -204,16 +204,10 @@ int main (int argc, char **argv) {
     if (errno == 1) {
         return 1;
     }
-<<<<<<< HEAD
     printf("----------------------------------------------------------------------\n");
     printf("available commands:\n");
     printf(" b (break), c (continue), s (stack), r (reset), p (power), q (quit)\n");
     printf("----------------------------------------------------------------------\n");
-=======
-    printf("--------------------------------------------------------------------\n");
-    printf("available commands: i (interrupt), c (continue), s (stack), r (reset), q (quit)\n");
-    printf("--------------------------------------------------------------------\n");
->>>>>>> master-sx
     printf("init done - press key to start\n");
     char c = getchar();
     getchar(); // remove line feed from stdin
@@ -242,13 +236,9 @@ int main (int argc, char **argv) {
         //     shutdown();
         //     break;
         // }
-        
+
         if (getline(&line, &size, stdin) > 0) {
-<<<<<<< HEAD
             const char *commands[] = { "quit", "break", "continue", "stack", "reset", "power" };
-=======
-            const char *commands[] = { "quit", "interrupt", "continue", "stack", "reset" };
->>>>>>> master-sx
             try {
                 int foundIndex = -1;
                 int foundCnt = 0;