search

phonegap / phonegap-plugin-push

Register and receive push notifications
MIT License
1.94k stars 1.91k forks source link

Unresolved Merge Conflict in master branch #1994

Closed olastor closed 7 years ago

olastor commented 7 years ago

I accidently found it at https://github.com/phonegap/phonegap-plugin-push/blob/master/src/android/com/adobe/phonegap/push/FCMService.java#L636 . I thought this might not be intended to be there and just wanted to let you know if so.

macdonst commented 7 years ago

@olastor thanks, I appreciate the heads up. I've switched over to VS Code and I messed up on a merge.

lock[bot] commented 6 years ago

This thread has been automatically locked.