projects
/
advent_of_code_2019.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c9f207
)
Forget to merge some lines.
author
Greg Burri
<greg.burri@gmail.com>
Mon, 9 Dec 2019 19:23:56 +0000
(20:23 +0100)
committer
Greg Burri
<greg.burri@gmail.com>
Mon, 9 Dec 2019 19:23:56 +0000
(20:23 +0100)
src/main.rs
patch
|
blob
|
history
diff --git
a/src/main.rs
b/src/main.rs
index
f4a1fa9
..
2c96367
100644
(file)
--- a/
src/main.rs
+++ b/
src/main.rs
@@
-83,16
+83,12
@@
fn main() {
day01,
day02,
day03,
-<<<<<<< HEAD
- day04
-=======
day04,
day05,
day06,
day07,
day08,
day09
->>>>>>> 91620914391b197fab0624a627f1b0a24ff75364
);
let args: Vec<String> = env::args().skip(1).collect();