a demo of merge - #1

Open

hogwild wants to merge 25 commits into

Introtocs:masterfrom

hogwild:master

Commits on Oct 21, 2017

Add file for ICS Fall2017
Hogwild
committed
91b8a7a
a new file for mynewbranch
Hogwild
committed
adf08f8
delete the newbranchfile
Hogwild
committed
e7c8809
the solutions of Cuboid
Hogwild
committed
acdc3db
the solution of dice
Hogwild
committed
67ad499
remove the starting codes
Hogwild
committed
781dce7
use parameter u
Hogwild
committed
73457e2
the test is finished
Hogwild
committed
75af23f
a new folder with files
Hogwild
committed
a40e425
Update fileinfolder
hogwild
authored
e6c8155
modified readme
Hogwild
committed
4270cee
Update README.md
hogwild
authored
71116f4
readme modified
Hogwild
committed
809a2ca
conflict solved
Hogwild
committed
f9b0c81

Commits on Nov 1, 2017

Merge pull request #1 from hogwild/theSolutions
hogwild
authored
2d1f95e
Update README.md
hogwild
authored
d2326f2
Merge branch 'master' into newbranch
hogwild
authored
98a3554
Merge pull request #2 from hogwild/newbranch
hogwild
authored
e455c57
Update README.md
hogwild
authored
8b6b6a4
Update README.md
hogwild
authored
2d4a67b
Merge pull request #3 from hogwild/newbranch
hogwild
authored
3c4b331
Update README.md
hogwild
authored
0be5c0b
Update README.md
hogwild
authored
947d34c
Merge branch 'master' into newbranch
hogwild
authored
565473f
Merge pull request #4 from hogwild/newbranch
hogwild
authored
1957e94