numixproject/com.numix.icons_circle — pull request #1 by dtchanpura (2014-07-16 14:19:17+00:00)
Title: Conflicts in between two icons

Conflicts in between net.cactii.flash2 and com.drinkdrankwasted.android.cvt
The line overwrites the original flashlight icon with the earlier one.