We might have touched the same file, but the merge worked so hopefully nothing broke

nathanlea / HotelReservation

0 stars 0 forks source link

We might have touched the same file, but the merge worked so hopefully nothing broke #42

Closed nathanlea closed 8 years ago

kdangel commented 8 years ago

You know which file?

nathanlea commented 8 years ago

It was RoomListTableViewController, but I only added one method so we are good, I was playing around in there but I couldn't get it to do what I want so I didn't push it. Sorry for the confusion.