got rid of leftover junk from fixing conflict

This commit is contained in:
fwiffo 2015-09-03 22:05:22 -07:00
parent b9380dab8a
commit 745df7001f

View File

@ -19,10 +19,8 @@
* [R](#r) * [R](#r)
* [Ruby](#ruby) * [Ruby](#ruby)
* [Rust](#rust) * [Rust](#rust)
<<<<<<< HEAD
* [Swift](#swift) * [Swift](#swift)
* [Windows Phone](#windowsphone) * [Windows Phone](#windowsphone)
=======
### Android ### Android