Download and install p4merge
- Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
- Copy only the p4merge.app file into your /Applications/ directory
diff --git a/core/src/main/java/my/com/iflix/core/ui/category/CategoryMVP.java b/core/src/main/java/my/com/iflix/core/ui/category/CategoryMVP.java | |
index 08fc66e5c..d11b4d820 100644 | |
--- a/core/src/main/java/my/com/iflix/core/ui/category/CategoryMVP.java | |
+++ b/core/src/main/java/my/com/iflix/core/ui/category/CategoryMVP.java | |
@@ -3,7 +3,6 @@ package my.com.iflix.core.ui.category; | |
import java.util.List; | |
import my.com.iflix.core.data.models.sportal_data.MediaElement; | |
-import my.com.iflix.core.ui.category.CategoryPresenter.Sort; | |
import my.com.iflix.core.ui.MvpStatefulPresenter; |
:q |
[alias] | |
rpull = pull --rebase --stat | |
pullr = pull --rebase --stat | |
ap = add --patch | |
ad = add . | |
bl = blame -w | |
br = branch | |
ci = commit | |
cm = commit -m | |
co = checkout |