mergeconflict fixed

abranhe · abranhe · commit de069baca2ba · 2018-10-19T12:13:13.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,17 +5,9 @@ sudo: false
 jdk:
 - oraclejdk8
 
-# Automatic Javadoc deploy:
-after_success:
-- ".util/deploy.sh"
-
 notifications:
   email: false
 
-env:
-  global:
-    secure: EfPAmwQEQO9Ku2ijDR6Ju3agWOOWLS+rJBv9UQELsX4+Nu2aX/xloBexW6xS6syMxu1F/xDTYvhZRZFzkQjWefZBxKZtJwZv3gRHUc3xh+kYKnxiD1QN3e3tU9BC4h/Ka1gZFwCOQc042MxfJEMnSGwL85BYdyhheACBUCV19ZO9Ft+E31XsOQyBmeB5ma7Gtig4abPR1s1ccFiOrO8TzBXozl7gWoSNtjtihsTc9aQHSwP8mOdy0gr7ZEqHauwj+75B427D233r9Ezn+DlHZ4B8rNs6f39gbIvEGt7+jJt0GJ0KYb84PKi6PRwbHdaQQNhG+un3TC0mYIkdUx7HvcuYfOJlZQsaiS4Vnsc5czDRbhJb6yMf6TWKlCUONQieiQdZCk1cKyRVfMVcTbtZp+0+fsvYuOVm+wlhYnSLdaPuR+OZhtxUDf4UJg7C0vWXYXzY5JjWJ6O9bUn+1YQL1jSiDAbwm+OTKB/oKR93Q++OZOW1kpm6XLJBN6vk24I49qjsrFVr6TQUUFryxupFTOsyqTsQwKUSwEIBaLyym85+mnM5Qd8E+bPqmhm0Tzbod0RIqxik6afcjPkLKpDi3sVUxEdd6/YYoiW8Jz5yVjLkkFaNqE6QmMVx4K5StPMmcC38MKgStx+/inXmaC+daKashYdInE2xKYWyYA+dm5A=
-
 cache:
   directories:
-  - "$HOME/.m2"
+  - "$HOME/.m2"
diff --git a/.util/deploy.sh b/.util/deploy.sh
diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 <div align="center">
-	<a href="https://java.allalgorithms.com/"><img src="https://cdn.abranhe.com/projects/algorithms/logo.svg" width="30%">
+	<a href="https://java.allalgorithms.com"><img src="https://cdn.abranhe.com/projects/algorithms/logo.svg" width="30%">
 	</a>
 	<br>
 	<br>
@@ -54,9 +54,9 @@ Read the detailed documentation at [java.allalgorithms.com](https://java.allalgo
 
 ```
 compile 'com.abranhe:bigdecimal:0 .0.1'
-``` 
+```
 
-## Import 
+## Import
 
 ```
 import com.abranhe.allalgorithms.*;
@@ -69,7 +69,7 @@ import com.abranhe.allalgorithms.searches.*;
 
 public static void main(String[] args) {
     int[] arr = {7, 2, 1, 19};
-    
+
     MergeSort.sort(arr);
     // {1, 2, 7, 19}
 }
@@ -116,4 +116,4 @@ public static void main(String[] args) {
 		<img src="https://cdn.abranhe.com/projects/algorithms/logo.svg" width="50px">
 	</a>
   <br>
-</div>
+</div>
