From: Greg Burri Date: Mon, 9 Dec 2019 19:23:56 +0000 (+0100) Subject: Forget to merge some lines. X-Git-Url: http://git.euphorik.ch/index.cgi?a=commitdiff_plain;h=6fbe5263a5ac4526044d46379084ae2894446ce0;p=advent_of_code_2019.git Forget to merge some lines. --- diff --git a/src/main.rs b/src/main.rs index f4a1fa9..2c96367 100644 --- 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 = env::args().skip(1).collect();