Permalink
Browse files

fixing merge

  • Loading branch information...
1 parent 10128cd commit 0a0a05919b72039eea080e055c30248e6c1a5abd @shatsar shatsar committed Oct 19, 2012
@@ -3,24 +3,14 @@
<groupId>com.mashape.clients</groupId>
<artifactId>mashape-java-client</artifactId>
<versioning>
-<<<<<<< HEAD
<release>2.0.6</release>
-=======
- <release>2.0.5</release>
->>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467
<versions>
<version>2.0.1</version>
<version>2.0.2</version>
<version>2.0.3</version>
<version>2.0.4</version>
-<<<<<<< HEAD
<version>2.0.6</version>
</versions>
<lastUpdated>20121019001700</lastUpdated>
-=======
- <version>2.0.5</version>
- </versions>
- <lastUpdated>20121018014431</lastUpdated>
->>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467
</versioning>
</metadata>
@@ -1,5 +1 @@
-<<<<<<< HEAD
-ce1c097b8152283b676c8422d911e982
-=======
89295a6e60113a8044e5bee5ae6a22b4
->>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467
@@ -1,5 +1 @@
-<<<<<<< HEAD
-04474167c811a42e195411731dc04d0eed552612
-=======
46efefd5551e6a99a039f006282e0138f218fd2e
->>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467

0 comments on commit 0a0a059

Please sign in to comment.