tt-jess pull request - #84

Open

eating247 wants to merge 15 commits into

vikingeducation:masterfrom

eating247:master

Commits on Oct 25, 2016

initial commit
Jessica G
committed
c0fabae
second update
eating247
committed
2317c9a
practice second round
Jessica G
committed
d4bef15
add line for conflict
Jessica G
committed
612a849
add another response
eating247
committed
deaad51
tt added change for merge conflict
eating247
committed
25ac4d4
fix conflict
Jessica G
committed
b91d5f4
tt resolve merge conflict
eating247
committed
c2f1da8
fix second conflict
Jessica G
committed
971402a

Commits on Nov 29, 2016

first contribution by tingting
eating247
committed
17a5576
THESE ARE MY FAVORITE FOODS. ACCEPT ME
blackwright
committed
27a373b
merge conflict
blackwright
committed
69dee46
create merge conflict
blackwright
committed
1a0ec2f
merge conflict
eating247
committed
817e01f
resolve merge conflict
eating247
committed
7253120