seandepagnier / watchdog_pi

watchdog plugin for opencpn
GNU General Public License v3.0
10 stars 19 forks source link

Update to Testplugin v1.0.176.1 #118

Closed rgleason closed 3 years ago

rgleason commented 3 years ago

Sean these conflicts are easily solved, if you can give me access to "Resolve Conflicts" https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

Maybe I will just use the command line to resolve them this time.