Merge pull request processing#2824 from federicobond/remove-merge-artifact

benfry · benfry · commit b5046d2e2106 · 2014-08-26T14:48:43.000-04:00
Remove merge artifact in IntDict javadoc
diff --git a/core/src/processing/data/IntDict.java b/core/src/processing/data/IntDict.java
@@ -561,13 +561,8 @@ public void sortKeysReverse() {
 
 
   /**
-<<<<<<< HEAD
-   * Sort by values in descending order (largest value will be at [0]).
-   *
-=======
    * Sort by values in ascending order. The smallest value will be at [0].
    *
->>>>>>> cd467dc12a42d588638aaab06746bebdfb333cc4
    * @webref intdict:method
    * @brief Sort by values in ascending order
    */
