Permalink
Browse files

fix from merge

  • Loading branch information...
1 parent 377fb41 commit b5188bbad9fb775340f8c36598b3da2eddca69fa @thpryrchn thpryrchn committed Sep 23, 2012
Showing with 0 additions and 6 deletions.
  1. +0 −6 lib/siriproxy/version.rb
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-class SiriProxy
- VERSION = "0.9.14"
-end
-=======
class SiriProxy
VERSION = "0.11.3"
end
->>>>>>> IOS 6 Support & iPad 3, iPhone 5.

0 comments on commit b5188bb

Please sign in to comment.