-
Notifications
You must be signed in to change notification settings - Fork 78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fun facts #72
Open
jazmine7909
wants to merge
47
commits into
FuadBalashov:master
Choose a base branch
from
jazmine7909:fixMergeConflict
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fun facts #72
Changes from all commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
b87550a
Add files via upload
Galladaeus dacad32
First commit
samratjha96 0e56f78
Justins information added
0e9da23
Liya information added
lketema 3dc8b26
Geri's info added
c7da105
daniel info added
djbeall dee315d
My info added
fa87df1
Sara info added
8c7f1f0
Add Rohan's bio
rmmr1002 86bea7e
Stephen information added
sdusseau 7878dd7
Merge pull request #46 from sjha96/add-samrat-info
FuadBalashov 948c68b
Noah information added
nasalomons 725f0b2
Add Rohan's bio
rmmr1002 cadeac3
Create henry.xml
jimenezhenry 1b2e683
Merge pull request #1 from jimenezhenry/add-henry-info
jimenezhenry 4cecff4
Merge pull request #49 from RPrather27/add-justins-info
FuadBalashov 29c0054
philip gouldman information added
thunderd568 c2dd486
Merge pull request #50 from chakotayka/add-Sara-info
FuadBalashov 3aed4e4
Merge pull request #51 from djbeall1101/add-Daniel-info
FuadBalashov e2f8188
Delete Geri.xml~
727f231
Merge pull request #52 from lketema/add-liya-info
FuadBalashov f8f31a6
Merge pull request #53 from Galladaeus/master
FuadBalashov 5c4081c
AndrewN information added
natarian 6c52055
Merge pull request #54 from sdusseau/add-Stephen-info
FuadBalashov 3d6d606
Merge pull request #56 from thunderd568/add-philipG-info
FuadBalashov 76f36f4
Jeremy information added
af34f6b
Update Geri.xml
6919721
Merge pull request #55 from rmmr1002/Rohan_infp
FuadBalashov 84db2fd
Merge pull request #47 from gdune/add-Geri-info
FuadBalashov 35f0772
done
738f81f
Merge pull request #58 from jimenezhenry/master
FuadBalashov 420e651
Merge pull request #59 from natarian/add-AndrewN-info
FuadBalashov a855259
jason_ramsey information added
jramsey3 33d7762
akshaya information added
cmsc216nsa b6e4acb
Merge pull request #60 from Jaydee8866/add-Jaydee8866_info
FuadBalashov 5b44791
Merge pull request #63 from jramsey3/add-JasonRamsey-info
FuadBalashov cf949a6
Merge pull request #62 from nasalomons/master
FuadBalashov 5d02df6
Merge pull request #64 from cmsc216nsa/add-akshaya-info
FuadBalashov 02ff1a5
Merge pull request #48 from jazmine7909/add-jazmine7909-info
FuadBalashov c9621b7
Merge pull request #61 from j8sr/master
FuadBalashov ef4d7aa
VladDobrin info added
VladDobrin 2b9f37c
Merge pull request #65 from VladDobrin/add-VladDobrin-info
FuadBalashov cbd8f5f
Add introduce_merge_conflicts.py file
d394b6d
merge monster
FuadBalashov d3c82e8
Fun facts
f152d92
Merge pull request #68 from FuadBalashov/generate-conflicts
FuadBalashov 5c16da4
fixed the issue
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Sara Bittner</name> | ||
| <favoriteCereal>Fruit Loops</favoriteCereal> | ||
| <funfact>Figure Skater</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Andrew Natarian</name> | ||
| <favoriteCereal>Frosted Mini Wheats</favoriteCereal> | ||
| <funfact>I can juggle...kind of</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Geri Dunellari</name> | ||
| <favoriteCereal>Honey Wheats</favoriteCereal> | ||
| <funfact>Favorite Movie Character: Jack Sparrow</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Jatin D</name> | ||
| <favoriteCereal>I dunno</favoriteCereal> | ||
| <funfact>likes sleeping</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <<<<<<< HEAD | ||
| <participant> | ||
| <name>Jazmine Smith</name> | ||
| <favoriteCereal>Frosted Flakes</favoriteCereal> | ||
| <funFact>I love steak</funFact> | ||
| </participant> | ||
| ======= | ||
| <participant> | ||
| <name>Jazmine Smith</name> | ||
| <favoriteCereal>Frosted Flakes</favoriteCereal> | ||
| <funfact>I love steak</funfact> | ||
| </participant> | ||
| >>>>>>> f152d92687454df13d2345f54aedce2ed017041e | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Jeremy Klein</name> | ||
| <favoriteCereal>Cheerios<img src="http://i.imgur.com/RNvRRiz.png" alt ="" style="width:100;height:100;"></favoriteCereal> | ||
| <funfact>my favorite card game and drink share the same name!</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>John Smith</name> | ||
| <favoriteCereal>Lucky Charms</favoriteCereal> | ||
| <funfact>Professional Underwater Basket Weaver</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Rohan Mishra</name> | ||
| <favoriteCereal>Cocoa Puffs</favoriteCereal> | ||
| <funfact>VZero artistic talent</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Samrat</name> | ||
| <favoriteCereal>Honey Nut Cheerios</favoriteCereal> | ||
| <funfact>CEO</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Stephen Dusseau</name> | ||
| <favoriteCereal>Cheerios</favoriteCereal> | ||
| <funfact>I'm bad at CS</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Vlad and Mark </name> | ||
| <favoriteCereal>Cherrios </favoriteCereal> | ||
| <funfact> can type </funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Akshaya Anand</name> | ||
| <favoriteCereal>Corn Flakes</favoriteCereal> | ||
| <funfact>I enjoy origami</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Daniel Beall</name> | ||
| <favoriteCereal>I don't like cereal</favoriteCereal> | ||
| <funfact>I play drums</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Liya Ketema</name> | ||
| <favoriteCereal>Corn Flakes</favoriteCereal> | ||
| <funfact>In b/n bilingual-trilingual</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Henry</name> | ||
| <favoriteCereal>Fruit Loops</favoriteCereal> | ||
| <funfact>Used to be part of UMD's boxing team</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Jason Ramsey</name> | ||
| <favoriteCereal>Raisin Bran</favoriteCereal> | ||
| <funfact>Grumpy ol' Fart</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <participant> | ||
| <name>John</name> | ||
| <favoriteCereal>Lucky Charms</favoriteCereal> | ||
| <funfact>Professional Basket Weaver</funfact> | ||
| </participant> | ||
| <participant> | ||
| <name>John</name> | ||
| <favoriteCereal>Lucky Charms</favoriteCereal> | ||
| <funfact>Professional Basket Weaver</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Justin Singer</name> | ||
| <favoriteCereal>Apple Jacks</favoriteCereal> | ||
| <funfact>I'm the only person who likes apple jacks :(</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Philip Gouldman</name> | ||
| <favoriteCereal>Honey Nut Cheerios</favoriteCereal> | ||
| <funfact>Currently a rhythm guitarist in a melodic death metal band</funfact> | ||
| </participant> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <participant> | ||
| <name>Titus Rasmussen</name> | ||
| <favoriteCereal>Cinnamon Toast Crunch</favoriteCereal> | ||
| <funfact>Have a GED</funfact> | ||
| </participant> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hey jasmine, can you delete:
the lower section of this file,
the
<<<<<<<<< HEAD,the
=========and the>>>>>>>>> f152d92687454df13d2345f54aedce2ed017041eit should look like: