Resolved Merge Conflict

Stericson · Stericson · commit ef504e0bb2f7 · 2016-12-17T13:54:56.000-05:00
diff --git a/src/main/java/com/stericson/RootShell/RootShell.java b/src/main/java/com/stericson/RootShell/RootShell.java
@@ -413,11 +413,11 @@ public void commandOutput(int id, String line) {
     }
 
     /**
-     * @return <code>true</code> if BusyBox was found.
+     * @return <code>true</code> if BusyBox or Toybox was found.
      */
     public static boolean isBusyboxAvailable()
     {
-        return (findBinary("busybox", true)).size() > 0;
+        return (findBinary("busybox", true)).size() > 0 || (findBinary("toybox", true)).size() > 0;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -413,11 +413,11 @@ public void commandOutput(int id, String line) {`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`/**`
`416`		`- * @return <code>true</code> if BusyBox was found.`
	`416`	`+ * @return <code>true</code> if BusyBox or Toybox was found.`
`417`	`417`	`*/`
`418`	`418`	`public static boolean isBusyboxAvailable()`
`419`	`419`	`{`
`420`		`- return (findBinary("busybox", true)).size() > 0;`
	`420`	`+ return (findBinary("busybox", true)).size() > 0 \|\| (findBinary("toybox", true)).size() > 0;`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`/**`