Skip to content

Commit 8a1a9e7

Browse files
梶塚太智thejustcube
authored andcommitted
Format
modified: src/main.rs
1 parent c3d35d2 commit 8a1a9e7

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/main.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,7 @@ impl Executor {
869869
}
870870
}
871871
<<<<<<< HEAD
872+
<<<<<<< HEAD
872873
<<<<<<< HEAD
873874

874875
self.log_print(String::from("Error! item not found in the list\n"));
@@ -877,6 +878,9 @@ impl Executor {
877878
>>>>>>> ce3cc7e (git)
878879
=======
879880

881+
=======
882+
883+
>>>>>>> 61ad1c1 (Format)
880884
self.log_print(String::from("Error! item not found in the list\n"));
881885
>>>>>>> 0c174e6 (Update main.rs)
882886
self.stack.push(Type::Error(String::from("item-not-found")));

0 commit comments

Comments
 (0)