fixed merged content

tahseen · Jun 10, 2015 · f3d5bce · f3d5bce
1 parent aa41e49
commit f3d5bce
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -102,11 +102,7 @@ AmazonCloudSearchResult result = client.search(query);
 
 Dependencies 
 ============
-<<<<<<< HEAD
 * Amazon SDK 1.9.33 and higher
-=======
-* Amazon SDK 1.9.13 and higher
->>>>>>> d4b88b99219e9fd16344e6e003ce129587ded301
 * Apache Fluent HC Module 4.2 and higher
 
 Maven