Update main.rs

梶塚太智 · thejustcube · commit c3d35d2e5545 · 2024-03-25T10:28:28.000+09:00
modified:   src/main.rs
diff --git a/src/main.rs b/src/main.rs
@@ -868,12 +868,17 @@ impl Executor {
                         return;
                     }
                 }
+<<<<<<< HEAD
 <<<<<<< HEAD
 
                 self.log_print(String::from("Error! item not found in the list\n"));
 =======
                 self.log_print(String::from("Error! item not found in the list").as_str().to_owned() + "\n");
 >>>>>>> ce3cc7e (git)
+=======
+                
+                self.log_print(String::from("Error! item not found in the list\n"));
+>>>>>>> 0c174e6 (Update main.rs)
                 self.stack.push(Type::Error(String::from("item-not-found")));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -868,12 +868,17 @@ impl Executor {`
`868`	`868`	`return;`
`869`	`869`	`}`
`870`	`870`	`}`
	`871`	`+<<<<<<< HEAD`
`871`	`872`	`<<<<<<< HEAD`
`872`	`873`
`873`	`874`	`self.log_print(String::from("Error! item not found in the list\n"));`
`874`	`875`	`=======`
`875`	`876`	`self.log_print(String::from("Error! item not found in the list").as_str().to_owned() + "\n");`
`876`	`877`	`>>>>>>> ce3cc7e (git)`
	`878`	`+=======`
	`879`	`+`
	`880`	`+ self.log_print(String::from("Error! item not found in the list\n"));`
	`881`	`+>>>>>>> 0c174e6 (Update main.rs)`
`877`	`882`	`self.stack.push(Type::Error(String::from("item-not-found")));`
`878`	`883`	`}`
`879`	`884`