Fix: Unresolved conflict commit in .gitignore

guardianproject / haven

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

https://guardianproject.github.io/haven/

GNU General Public License v3.0

6.62k stars 728 forks source link

Fix: Unresolved conflict commit in .gitignore #353

Closed IsaacYAGI closed 6 years ago

IsaacYAGI commented 6 years ago

I made the merge for .gitignore file which wasn't merged but was uploaded anyway