brianquimio / cs373-idb

Project for CS 373 Software Engineering taught by Glenn Downing
0 stars 0 forks source link

Remove merge conflict text from index.html #31

Closed shperl closed 8 years ago

shperl commented 8 years ago

Didn't remove merge conflict text from index.html when merging back from iss21->dev. Need remove text.