Skip to content

Commit 46cc2ae

Browse files
committed
git
modified: src/main.rs modified: src/main.rs
1 parent a160458 commit 46cc2ae

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

src/main.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,8 +1444,15 @@ impl Executor {
14441444
=======
14451445
=======
14461446
=======
1447+
<<<<<<< HEAD
14471448
>>>>>>> ce3cc7e (git)
1449+
<<<<<<< HEAD
14481450
>>>>>>> cdb5350 (git)
1451+
=======
1452+
=======
1453+
>>>>>>> ce80cb2 (git)
1454+
>>>>>>> 74bbfe3 (git)
1455+
>>>>>>> e1b0d54 (git)
14491456
"index" => {
14501457
let findhint = self.pop_stack().get_string();
14511458
let findtarget = self.pop_stack().get_list();
@@ -1472,26 +1479,35 @@ impl Executor {
14721479
<<<<<<< HEAD
14731480
<<<<<<< HEAD
14741481
<<<<<<< HEAD
1482+
<<<<<<< HEAD
14751483
=======
14761484
>>>>>>> cdb5350 (git)
1485+
=======
1486+
>>>>>>> e1b0d54 (git)
14771487
>>>>>>> 887510b (git)
14781488
=======
14791489
=======
14801490
>>>>>>> 1d34bfe (Refactoring)
14811491
>>>>>>> ce3cc7e (git)
14821492
<<<<<<< HEAD
1493+
<<<<<<< HEAD
1494+
=======
1495+
>>>>>>> e1b0d54 (git)
14831496
=======
14841497
=======
14851498
>>>>>>> 1d34bfe (Refactoring)
14861499
=======
14871500
>>>>>>> 887510b (git)
14881501
>>>>>>> ce80cb2 (git)
14891502
>>>>>>> 74bbfe3 (git)
1503+
<<<<<<< HEAD
14901504
=======
14911505
>>>>>>> 887510b (git)
14921506
>>>>>>> 1843023 (git)
14931507
=======
14941508
>>>>>>> cdb5350 (git)
1509+
=======
1510+
>>>>>>> e1b0d54 (git)
14951511
// If it is not recognized as a command, use it as a string.
14961512
_ => self.stack.push(Type::String(command)),
14971513
}

0 commit comments

Comments
 (0)