eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge artifact in IntDict javadoc

Browse Source
This commit is contained in:
Federico Bond
2014-08-25 09:54:13 -03:00
parent 25ed6fed3b
commit 7d09cd08a7
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/processing/data/IntDict.java
View File

@@ -561,13 +561,8 @@ public class IntDict {
/**
<<<<<<< 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
*/