diff --git a/Sara.xml b/Sara.xml new file mode 100644 index 0000000..e4bd0c4 --- /dev/null +++ b/Sara.xml @@ -0,0 +1,5 @@ + + Sara Bittner + Fruit Loops + Figure Skater + diff --git a/introduce_merge_conflicts.py b/introduce_merge_conflicts.py new file mode 100644 index 0000000..6258284 --- /dev/null +++ b/introduce_merge_conflicts.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python + +import os + +PARTICIPANTS_DIR = 'participants' + +participant_files = os.listdir(PARTICIPANTS_DIR) + +for file_name in participant_files: + file = open(PARTICIPANTS_DIR + '/' + file_name, 'r') + lines = file.readlines() + file.close() + + lines_with_spaces = [] + for line in lines: + lines_with_spaces.append(' ' + line) + + file = open(PARTICIPANTS_DIR + '/' + file_name, 'w') + file.writelines(lines_with_spaces) + file.close() diff --git a/participants/AndrewN.xml b/participants/AndrewN.xml new file mode 100644 index 0000000..229d58b --- /dev/null +++ b/participants/AndrewN.xml @@ -0,0 +1,5 @@ + + Andrew Natarian + Frosted Mini Wheats + I can juggle...kind of + diff --git a/participants/Geri.xml b/participants/Geri.xml new file mode 100644 index 0000000..90c00db --- /dev/null +++ b/participants/Geri.xml @@ -0,0 +1,5 @@ + + Geri Dunellari + Honey Wheats + Favorite Movie Character: Jack Sparrow + diff --git a/participants/Jaydee8866.xml b/participants/Jaydee8866.xml new file mode 100644 index 0000000..a1d6d88 --- /dev/null +++ b/participants/Jaydee8866.xml @@ -0,0 +1,5 @@ + + Jatin D + I dunno + likes sleeping + diff --git a/participants/Jazmine.xml b/participants/Jazmine.xml new file mode 100644 index 0000000..3791f9e --- /dev/null +++ b/participants/Jazmine.xml @@ -0,0 +1,13 @@ +<<<<<<< HEAD + + Jazmine Smith + Frosted Flakes + I love steak + +======= + + Jazmine Smith + Frosted Flakes + I love steak + +>>>>>>> f152d92687454df13d2345f54aedce2ed017041e diff --git a/participants/Jeremy.xml b/participants/Jeremy.xml new file mode 100644 index 0000000..0b96e8d --- /dev/null +++ b/participants/Jeremy.xml @@ -0,0 +1,5 @@ + + Jeremy Klein + Cheerios + my favorite card game and drink share the same name! + diff --git a/participants/Noah.xml b/participants/Noah.xml new file mode 100644 index 0000000..664e6a7 --- /dev/null +++ b/participants/Noah.xml @@ -0,0 +1,5 @@ + + John Smith + Lucky Charms + Professional Underwater Basket Weaver + diff --git a/participants/Rohan.xml b/participants/Rohan.xml new file mode 100644 index 0000000..24223cb --- /dev/null +++ b/participants/Rohan.xml @@ -0,0 +1,5 @@ + + Rohan Mishra + Cocoa Puffs + VZero artistic talent + diff --git a/participants/Samrat.xml b/participants/Samrat.xml new file mode 100644 index 0000000..ded02bd --- /dev/null +++ b/participants/Samrat.xml @@ -0,0 +1,5 @@ + + Samrat + Honey Nut Cheerios + CEO + \ No newline at end of file diff --git a/participants/Stephen.xml b/participants/Stephen.xml new file mode 100644 index 0000000..97f49de --- /dev/null +++ b/participants/Stephen.xml @@ -0,0 +1,5 @@ + + Stephen Dusseau + Cheerios + I'm bad at CS + diff --git a/participants/Vladinfo.xml b/participants/Vladinfo.xml new file mode 100644 index 0000000..d8b081b --- /dev/null +++ b/participants/Vladinfo.xml @@ -0,0 +1,5 @@ + + Vlad and Mark + Cherrios + can type + diff --git a/participants/akshaya.xml b/participants/akshaya.xml new file mode 100644 index 0000000..f9c2fdf --- /dev/null +++ b/participants/akshaya.xml @@ -0,0 +1,5 @@ + + Akshaya Anand + Corn Flakes + I enjoy origami + diff --git a/participants/daniel.xml b/participants/daniel.xml new file mode 100644 index 0000000..344b3b9 --- /dev/null +++ b/participants/daniel.xml @@ -0,0 +1,5 @@ + + Daniel Beall + I don't like cereal + I play drums + diff --git a/participants/file_liya.xml b/participants/file_liya.xml new file mode 100644 index 0000000..0b6e315 --- /dev/null +++ b/participants/file_liya.xml @@ -0,0 +1,5 @@ + + Liya Ketema + Corn Flakes + In b/n bilingual-trilingual + diff --git a/participants/henry.xml b/participants/henry.xml new file mode 100644 index 0000000..6a72a4b --- /dev/null +++ b/participants/henry.xml @@ -0,0 +1,5 @@ + + Henry + Fruit Loops + Used to be part of UMD's boxing team + diff --git a/participants/jason_ramsey.xml b/participants/jason_ramsey.xml new file mode 100644 index 0000000..5fbbd26 --- /dev/null +++ b/participants/jason_ramsey.xml @@ -0,0 +1,5 @@ + + Jason Ramsey + Raisin Bran + Grumpy ol' Fart + diff --git a/participants/john.xml b/participants/john.xml index 44a29d4..aee4563 100644 --- a/participants/john.xml +++ b/participants/john.xml @@ -1,5 +1,5 @@ - - John - Lucky Charms - Professional Basket Weaver - + + John + Lucky Charms + Professional Basket Weaver + diff --git a/participants/justinsinger.xml b/participants/justinsinger.xml new file mode 100644 index 0000000..4de4245 --- /dev/null +++ b/participants/justinsinger.xml @@ -0,0 +1,5 @@ + + Justin Singer + Apple Jacks + I'm the only person who likes apple jacks :( + diff --git a/participants/philip-gouldman.xml b/participants/philip-gouldman.xml new file mode 100644 index 0000000..4f4e250 --- /dev/null +++ b/participants/philip-gouldman.xml @@ -0,0 +1,5 @@ + + Philip Gouldman + Honey Nut Cheerios + Currently a rhythm guitarist in a melodic death metal band + diff --git a/participants/titus.xml b/participants/titus.xml new file mode 100644 index 0000000..fd64782 --- /dev/null +++ b/participants/titus.xml @@ -0,0 +1,5 @@ + + Titus Rasmussen + Cinnamon Toast Crunch + Have a GED +