Merge pull request #84 from plivo/add_getter_setter

merge conflict fixed
plivo · Nov 13, 2018 · 68f6119 · 68f6119
2 parents 4fe5a52 + 2f663ff
commit 68f6119
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -21,11 +21,7 @@ If you are using Maven, use the following XML to include the Plivo SDK as a depe
 
 If you are using Gradle, use the following line in your dependencies.
 ```
-<<<<<<< HEAD
 compile 'com.plivo:plivo-java:4.3.0-beta-1'
-=======
-compile 'com.plivo:plivo-java:4.1.5'
->>>>>>> master
 ```
 
 Note: if you are already using Retrofit, exclude this SDK's dependency so there is no version conflict.