Merge pull request #74 from Galladaeus/fixMergeConflict

nice
FuadBalashov · Sep 5, 2017 · 5418c2b · 5418c2b
2 parents 5b159a1 + fddcedf
commit 5418c2b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/participants/titus.xml b/participants/titus.xml
@@ -1,5 +1,5 @@
-   <participant>
-     <name>Titus Rasmussen</name>
-     <favoriteCereal>Cinnamon Toast Crunch</favoriteCereal>
-     <funfact>Have a GED</funfact>
-   </participant>
+<participant>
+  <name>Titus Rasmussen</name>
+  <favoriteCereal>Cinnamon Toast Crunch</favoriteCereal>
+  <funFact>Have a GED</funFact>
+</participant>