fix: fix merge conflicts with main

src/template/mod.rs

@@ -34,6 +34,8 @@ pub fn read_file_part(folder: &str, day: Day, part: u8) -> String {
 }
 
 /// Creates the constant `DAY` and sets up the input and runner for each part.
+///
+/// Use the optional, second parameter, to only solve one specific part in isolation.
 #[macro_export]
 macro_rules! solution {
     ($day:expr) => {
@@ -47,17 +49,19 @@ macro_rules! solution {
             run_part(part_two, &input, DAY, 2);
         }
     };
-    ($day:expr, 1) => { /// Allows solving part one in isolation
-        const DAY: advent_of_code::Day = advent_of_code::day!($day);
+    ($day:expr, 1) => {
+        /// Allows solving part one in isolation
+        const DAY: advent_of_code::template::Day = advent_of_code::day!($day);
 
         fn main() {
             use advent_of_code::template::runner::*;
             let input = advent_of_code::template::read_file("inputs", DAY);
             run_part(part_one, &input, DAY, 1);
         }
     };
-    ($day:expr, 2) => { /// Allows solving part two in isolation
-        const DAY: advent_of_code::Day = advent_of_code::day!($day);
+    ($day:expr, 2) => {
+        /// Allows solving part two in isolation
+        const DAY: advent_of_code::template::Day = advent_of_code::day!($day);
 
         fn main() {
             use advent_of_code::template::runner::*;