Code

Liya - changed#78

Code

Open

lketema wants to merge 48 commits intoFuadBalashov:masterFuadBalashov/GitHackathon:masterfrom lketema:fixMergeConflictlketema/GitHackathon:fixMergeConflictCopy head branch name to clipboard

+121-5

Commits

Commits on Sep 5, 2017

• Add files via upload

  Galladaeus

  authored
  b87550a

  Copy full SHA for b87550a

• First commit

  samratjha96

  committed
  dacad32

  Copy full SHA for dacad32

• Justins information added

  

  Richard Prather

  committed
  0e56f78

  Copy full SHA for 0e56f78

• Liya information added

  lketema

  committed
  0e9da23

  Copy full SHA for 0e9da23

• Geri's info added

  

  gdune

  committed
  3dc8b26

  Copy full SHA for 3dc8b26

• daniel info added

  djbeall

  committed
  c7da105

  Copy full SHA for c7da105

• My info added

  

  jazzy

  committed
  dee315d

  Copy full SHA for dee315d

• Sara info added

  

  Sara Bittner

  committed
  fa87df1

  Copy full SHA for fa87df1

• Add Rohan's bio

  rmmr1002

  committed
  8c7f1f0

  Copy full SHA for 8c7f1f0

• Stephen information added

  sdusseau

  committed
  86bea7e

  Copy full SHA for 86bea7e

• Merge pull request FuadBalashov#46 from sjha96/add-samrat-info

  Show description for 7878dd7
  FuadBalashov

  authored
  7878dd7

  Copy full SHA for 7878dd7

• Noah information added

  nasalomons

  committed
  948c68b

  Copy full SHA for 948c68b

• Add Rohan's bio

  rmmr1002

  committed
  725f0b2

  Copy full SHA for 725f0b2

• Create henry.xml

  jimenezhenry

  authored
  cadeac3

  Copy full SHA for cadeac3

• Merge pull request FuadBalashov#1 from jimenezhenry/add-henry-info

  Show description for 1b2e683
  jimenezhenry

  authored
  1b2e683

  Copy full SHA for 1b2e683

• Merge pull request FuadBalashov#49 from RPrather27/add-justins-info

  Show description for 4cecff4
  FuadBalashov

  authored
  4cecff4

  Copy full SHA for 4cecff4

• philip gouldman information added

  thunderd568

  committed
  29c0054

  Copy full SHA for 29c0054

• Merge pull request FuadBalashov#50 from chakotayka/add-Sara-info

  Show description for c2dd486
  FuadBalashov

  authored
  c2dd486

  Copy full SHA for c2dd486

• Merge pull request FuadBalashov#51 from djbeall1101/add-Daniel-info

  Show description for 3aed4e4
  FuadBalashov

  authored
  3aed4e4

  Copy full SHA for 3aed4e4

• Delete Geri.xml~

  

  gdune

  authored
  e2f8188

  Copy full SHA for e2f8188

• Merge pull request FuadBalashov#52 from lketema/add-liya-info

  Show description for 727f231
  FuadBalashov

  authored
  727f231

  Copy full SHA for 727f231

• Merge pull request FuadBalashov#53 from Galladaeus/master

  Show description for f8f31a6
  FuadBalashov

  authored
  f8f31a6

  Copy full SHA for f8f31a6

• AndrewN information added

  natarian

  committed
  5c4081c

  Copy full SHA for 5c4081c

• Merge pull request FuadBalashov#54 from sdusseau/add-Stephen-info

  Show description for 6c52055
  FuadBalashov

  authored
  6c52055

  Copy full SHA for 6c52055

• Merge pull request FuadBalashov#56 from thunderd568/add-philipG-info

  Show description for 3d6d606
  FuadBalashov

  authored
  3d6d606

  Copy full SHA for 3d6d606

• Jeremy information added

  

  Ubuntu

  committed
  76f36f4

  Copy full SHA for 76f36f4

• Update Geri.xml

  

  gdune

  authored
  af34f6b

  Copy full SHA for af34f6b

• Merge pull request FuadBalashov#55 from rmmr1002/Rohan_infp

  Show description for 6919721
  FuadBalashov

  authored
  6919721

  Copy full SHA for 6919721

• Merge pull request FuadBalashov#47 from gdune/add-Geri-info

  Show description for 84db2fd
  FuadBalashov

  authored
  84db2fd

  Copy full SHA for 84db2fd

• done

  

  Jayu Dewani

  committed
  35f0772

  Copy full SHA for 35f0772

• Merge pull request FuadBalashov#58 from jimenezhenry/master

  Show description for 738f81f
  FuadBalashov

  authored
  738f81f

  Copy full SHA for 738f81f

• Merge pull request FuadBalashov#59 from natarian/add-AndrewN-info

  Show description for 420e651
  FuadBalashov

  authored
  420e651

  Copy full SHA for 420e651

• jason_ramsey information added

  jramsey3

  committed
  a855259

  Copy full SHA for a855259

• akshaya information added

  cmsc216nsa

  committed
  33d7762

  Copy full SHA for 33d7762

• Merge pull request FuadBalashov#60 from Jaydee8866/add-Jaydee8866_info

  Show description for b6e4acb
  FuadBalashov

  authored
  b6e4acb

  Copy full SHA for b6e4acb

• Merge pull request FuadBalashov#63 from jramsey3/add-JasonRamsey-info

  Show description for 5b44791
  FuadBalashov

  authored
  5b44791

  Copy full SHA for 5b44791

• Merge pull request FuadBalashov#62 from nasalomons/master

  Show description for cf949a6
  FuadBalashov

  authored
  cf949a6

  Copy full SHA for cf949a6

• Merge pull request FuadBalashov#64 from cmsc216nsa/add-akshaya-info

  Show description for 5d02df6
  FuadBalashov

  authored
  5d02df6

  Copy full SHA for 5d02df6

• Merge pull request FuadBalashov#48 from jazmine7909/add-jazmine7909-info

  Show description for 02ff1a5
  FuadBalashov

  authored
  02ff1a5

  Copy full SHA for 02ff1a5

• Merge pull request FuadBalashov#61 from j8sr/master

  Show description for c9621b7
  FuadBalashov

  authored
  c9621b7

  Copy full SHA for c9621b7

• VladDobrin info added

  VladDobrin

  committed
  ef4d7aa

  Copy full SHA for ef4d7aa

• Merge pull request FuadBalashov#65 from VladDobrin/add-VladDobrin-info

  Show description for 2b9f37c
  FuadBalashov

  authored
  2b9f37c

  Copy full SHA for 2b9f37c

• Add introduce_merge_conflicts.py file

  

  Ben Edgar

  authored and

  FuadBalashov

  committed
  cbd8f5f

  Copy full SHA for cbd8f5f

• merge monster

  FuadBalashov

  committed
  d394b6d

  Copy full SHA for d394b6d

• Merge pull request FuadBalashov#68 from FuadBalashov/generate-conflicts

  Show description for f152d92
  FuadBalashov

  authored
  f152d92

  Copy full SHA for f152d92

• Liya's information added

  lketema

  committed
  a5aacfe

  Copy full SHA for a5aacfe

• fixed conflicts

  lketema

  committed
  4b93aaf

  Copy full SHA for 4b93aaf

Commits on Sep 6, 2017

• erased conflicts

  lketema

  committed
  f7bd8a4

  Copy full SHA for f7bd8a4