The Readme.md file is not the one you committed.

githubteacher / github-for-developers-sept-2015

practice repo for the Sept 29-30 GitHub for Developers class

12 stars 36 forks source link

Closed milindrao closed 8 years ago

milindrao commented 8 years ago

The Readme.md file in master is showing all the changes made. With the conflicts. Not the resolved file you checked in.

milindrao commented 8 years ago

Hmmm. It looks like it got fixed now. Not sure how and when that happened.