Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
hampelm committed Jun 2, 2012
2 parents 8d33a8f + 415c721 commit 1f2e1e5
Showing 1 changed file with 90 additions and 90 deletions.
180 changes: 90 additions & 90 deletions list.yml
@@ -1,90 +1,90 @@
---
default: hawk.mp3

users:
# Add your GitHub user name, a colon, and the name of the sound file.
# For example:
# github_user_name: file_name.mp3
# Your can substitute your GitHub user name with your name:
# "Horatio Cain": file_name.mp3
# Or email address:
#
# sunglasses@miami.us: file_name.mp3
akit: The-Price-is-Right-losing-horn.mp3
aldeka: heypeterman.mp3
alexpandel: sneakymom.mp3
aliblack: blackpanties.mp3
amirbey: ATribeCalledQuest-OhMyGod.mp3
anemani: abhi.mp3
arielcharney: ATribeCalledQuest-OhMyGod.mp3
arouault: life_aquatic.mp3
atogle: megaman2_boss.mp3
baileyspace: picard.mp3
bensheldon: bad_apples.mp3
blakeshall: intheair.mp3
boundsj: milkshake_2.mp3
Buttonpresser: heypeterman.mp3
chachasikes: orca.mp3
ctbarna: cee_lo.mp3
danmelton: mow.mp3
dianapanda: ffvictory.mp3
dthompson: battle.mp3
dylanbathurst: sad_trombone.mp3
eddietejeda: thenextstop.mp3
ellereider: LR.mp3
emilyville: emilysong.mp3
gangleton: dwarf-minke.mp3
hampelm: oregon.mp3
jerseycoder: dsbs.mp3
jimcraner: shadyguy2.mp3
jllord: doink-doink.mp3
jmadans: HermanCain.mp3
joemerante: sirduke_clip.mp3
joelmahoney: bricks.mp3
justinstoller: sad_trombone.mp3
kmacedo: supermario.mp3
kmcurry: dub.mp3
mheadd: chant.mp3
linh8u: failhorn.mp3
mapmeld: nick_williamtell.mp3
mariejomr: mjsound.mp3
forestwizard: carelesswhisper.mp3
mertonium: gob-comeon.mp3
mishmosh: mariogrow.mp3
mjumbewu: golden_ticket.mp3
mlevans: git_push.mp3
nolastan: RandyMarsh.mp3
nouyang: helicohexrawr.mp3
onezerojeremy: driverwinner.mp3
pahlkadot: whistle.m4r
prashtx: topgun.mp3
mattlewissf: zoidberg.mp3
RobDavis: HermanCain.mp3
rockymeza: etude_for_piano_op_10_no_12.mp3
ryanatwork: USA-USA.mp3
scottsil: boom3.mp3
sferik: yes_we_can.mp3
snajmi: knightrider.mp3
TamaraShopsin: keystone_shopsin.mp3
timtimedin: flighthumans.mp3
tinio: hell.mp3
tylerstalder: chipmunk.mp3
unruthless: some_nights.mp3
webmaven: dialup.mp3
YenTheFirst: zim_knobs.mp3
yuletide: vassago.mp3
zachwill: inception.mp3
zzolo: chewy_cry.mp3
ezoehunt: i_made_this.mp3
Mr0grog: kookaberra.mp3
sheilabapat: Ludacris_Money_Maker.mp3

projects:
# For project-specific sounds you need to specify the GitHub project owner
codeforamerica:
# And the project name
cfa_coder_sounds: vuvuzela.mp3
designforamerica: dsbs.mp3
homework_notifier: hawk.mp3
open311dashboard: hawk.mp3
muralapp: chipmunk.mp3
---
default: hawk.mp3

users:
# Add your GitHub user name, a colon, and the name of the sound file.
# For example:
# github_user_name: file_name.mp3
# Your can substitute your GitHub user name with your name:
# "Horatio Cain": file_name.mp3
# Or email address:
#
# sunglasses@miami.us: file_name.mp3
akit: The-Price-is-Right-losing-horn.mp3
aldeka: heypeterman.mp3
alexpandel: sneakymom.mp3
aliblack: blackpanties.mp3
amirbey: ATribeCalledQuest-OhMyGod.mp3
anemani: abhi.mp3
arielcharney: life_aquatic.mp3
arouault: life_aquatic.mp3
atogle: megaman2_boss.mp3
baileyspace: picard.mp3
bensheldon: bad_apples.mp3
blakeshall: intheair.mp3
boundsj: milkshake_2.mp3
Buttonpresser: heypeterman.mp3
chachasikes: orca.mp3
ctbarna: cee_lo.mp3
danmelton: mow.mp3
dianapanda: ffvictory.mp3
dthompson: battle.mp3
dylanbathurst: sad_trombone.mp3
eddietejeda: thenextstop.mp3
ellereider: LR.mp3
emilyville: emilysong.mp3
gangleton: dwarf-minke.mp3
hampelm: oregon.mp3
jerseycoder: dsbs.mp3
jimcraner: shadyguy2.mp3
jllord: doink-doink.mp3
jmadans: HermanCain.mp3
joemerante: sirduke_clip.mp3
joelmahoney: bricks.mp3
justinstoller: sad_trombone.mp3
kmacedo: supermario.mp3
kmcurry: dub.mp3
mheadd: chant.mp3
linh8u: failhorn.mp3
mapmeld: nick_williamtell.mp3
mariejomr: mjsound.mp3
forestwizard: carelesswhisper.mp3
mertonium: gob-comeon.mp3
mishmosh: mariogrow.mp3
mjumbewu: golden_ticket.mp3
mlevans: git_push.mp3
nolastan: RandyMarsh.mp3
nouyang: helicohexrawr.mp3
onezerojeremy: driverwinner.mp3
pahlkadot: whistle.m4r
prashtx: topgun.mp3
mattlewissf: zoidberg.mp3
RobDavis: HermanCain.mp3
rockymeza: etude_for_piano_op_10_no_12.mp3
ryanatwork: USA-USA.mp3
scottsil: boom3.mp3
sferik: yes_we_can.mp3
snajmi: knightrider.mp3
TamaraShopsin: keystone_shopsin.mp3
timtimedin: flighthumans.mp3
tinio: hell.mp3
tylerstalder: chipmunk.mp3
unruthless: some_nights.mp3
webmaven: dialup.mp3
YenTheFirst: zim_knobs.mp3
yuletide: vassago.mp3
zachwill: inception.mp3
zzolo: chewy_cry.mp3
ezoehunt: i_made_this.mp3
Mr0grog: kookaberra.mp3
sheilabapat: Ludacris_Money_Maker.mp3

projects:
# For project-specific sounds you need to specify the GitHub project owner
codeforamerica:
# And the project name
cfa_coder_sounds: vuvuzela.mp3
designforamerica: dsbs.mp3
homework_notifier: hawk.mp3
open311dashboard: hawk.mp3
muralapp: chipmunk.mp3

0 comments on commit 1f2e1e5

Please sign in to comment.