guardianproject / Orweb

We are EOL this project. Please use Lightning Browser or wait for Orfox instead
https://guardianproject.info/2015/06/30/orfox-aspiring-to-bring-tor-browser-to-android/
Other
91 stars 45 forks source link

Fixed Issue #24 and other changes #29

Closed CptnBrittish closed 11 years ago

CptnBrittish commented 11 years ago
n8fr8 commented 11 years ago

Thanks for your submission! We will see which commits we can merge in.

CptnBrittish commented 11 years ago

Please ignore the removal of the @override lines as I have recently discovered it was because my language level was set to low in eclipse

n8fr8 commented 11 years ago

Just looking at merging this, but all of your files have a "^M" new line end character in them, which makes a proper merge not work. Any way you can clear that out, and push the changes into your branch?

CptnBrittish commented 11 years ago

The line endings should now be fixed. Sorry for the inconvenience I'm new to this.