search

OpenLitterMap / react-native

OpenLitterMap mobile app for Android and iOS
https://opengeospatialdata.springeropen.com/articles/10.1186/s40965-018-0050-y
8 stars 1 forks source link

Merge Staging #185

Closed xlcrr closed 2 years ago

xlcrr commented 2 years ago

@sudoDeznit I messed up here recently, accidentally merged master into staging, I was trying to close the other PR and get the commits counted towards pushing to the master branch... does this look okay to you to merge into main?

sudoDeznit commented 2 years ago

@xlcrr I don't think it will be a good idea... There are commits like 4aa804d and f796bac which can bring back the issues we had with master.

xlcrr commented 2 years ago

@sudoDeznit app builds for me on main and staging... I think we can merge

xlcrr commented 2 years ago

@sudoDeznit can you fix this merge conflict please