search

Davidwedel / QtAgOpenGPS

A Qt C++ port of BrianT's AgOpenGPS, forked from torriem
Other
1 stars 1 forks source link

Merge Errors #1

Closed Davidwedel closed 8 months ago

Davidwedel commented 8 months ago

I managed to create a merge conflict between my local/remote repositories the other afternoon. If someone has some advice, I'm open to it, otherwise, I'll fix it in the next day or so.

Davidwedel commented 8 months ago

Not sure how, but I seemed to fix it.