mhotan / DineOn

Git Repository for our 403(13sp) Android application "DineOn"
0 stars 0 forks source link

Read commit messeges #231

Closed jordanmcnea22 closed 11 years ago

mrathjen commented 11 years ago

Looks good

mrathjen commented 11 years ago

But I can't merge the pul request, I think you've got some merge conflicts