From: Greg Burri <greg.burri@gmail.com>
Date: Mon, 9 Dec 2019 19:23:04 +0000 (+0100)
Subject: Merge branch 'master' of github.com:Ummon/AdventOfCode2019
X-Git-Url: https://git.euphorik.ch/?a=commitdiff_plain;h=a52033c1f873adb00f70f37b09ce63da4ceb6e7d;p=advent_of_code_2019.git

Merge branch 'master' of github.com:Ummon/AdventOfCode2019

# Conflicts:
#	src/main.rs
---

a52033c1f873adb00f70f37b09ce63da4ceb6e7d
diff --cc src/day04.rs
index 9cf8099,0000000..8a5064f
mode 100644,000000..100644
--- a/src/day04.rs
+++ b/src/day04.rs
@@@ -1,10 -1,0 +1,16 @@@
 +
 +
++fn find_password(min: i32) {
++    ;
++}
++
++
++
 +#[cfg(test)]
 +mod tests {
 +    use super::*;
 +
 +    #[test]
 +    fn part1() {
 +    }
 +}
diff --cc src/main.rs
index 432b2f8,2c96367..f4a1fa9
--- a/src/main.rs
+++ b/src/main.rs
@@@ -44,7 -83,12 +83,16 @@@ fn main() 
          day01,
          day02,
          day03,
++<<<<<<< HEAD
 +        day04
++=======
+         day04,
+         day05,
+         day06,
+         day07,
+         day08,
+         day09
++>>>>>>> 91620914391b197fab0624a627f1b0a24ff75364
      );
  
      let args: Vec<String> = env::args().skip(1).collect();