From: Greg Burri <greg.burri@gmail.com>
Date: Mon, 9 Dec 2019 19:23:56 +0000 (+0100)
Subject: Forget to merge some lines.
X-Git-Url: https://git.euphorik.ch/?a=commitdiff_plain;h=a60229913ba3a14d780641ad93e172f7290374f6;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<String> = env::args().skip(1).collect();