search

LocalGod79 / UrsaPolaris

An Endless Sky post-main-arc universal outfitter station story
GNU General Public License v3.0
19 stars 14 forks source link

Fix leftover messages from 0.9.6 update #5

Closed necrodoom closed 7 years ago

LocalGod79 commented 7 years ago

why does it look like you deleted the entire file and replaced it?

necrodoom commented 7 years ago

I'm pretty sure it's because you changed the file 2 hours ago, resulting in a merge conflict (or at least that's what it is saying). Il do another PR for the updated version.