From: Grégory Burri <gregory.burri@matisa.ch>
Date: Mon, 9 Dec 2019 06:38:41 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Ummon/AdventOfCode2019
X-Git-Url: http://git.euphorik.ch/index.cgi?a=commitdiff_plain;h=3a151b4a9b95a995481be8126180511fc46df401;p=advent_of_code_2019.git

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

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

3a151b4a9b95a995481be8126180511fc46df401
diff --cc src/main.rs
index f00a372,1c320c5..d0dbfc3
--- a/src/main.rs
+++ b/src/main.rs
@@@ -5,7 -5,7 +5,8 @@@ use std::time::Instant
  mod day01;
  mod day02;
  mod day03;
 +mod day05;
+ mod day06;
  mod common;
  
  fn day01() -> String {