Haron-Prime
diff --git a/‎.config/Transmission Remote GUI/transgui.ini‎
Lines changed: 6 additions & 6 deletions b/‎.config/Transmission Remote GUI/transgui.ini‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎.config/sublime-text-3/Packages/User/Color Highlighter/icons/circle_icon_ffffffff.png‎
0 Bytes b/‎.config/sublime-text-3/Packages/User/Color Highlighter/icons/circle_icon_ffffffff.png‎
0 Bytes
@@ -237,12 +237,12 @@ UpSpeeds=0,10,25,50,100,250,500,750,1000,2500,5000,7000
 [AddTorrent.desktop]
 FolderCount=10
 =<<<<<<< HEAD
-Folder0=/home/haron/Video/FANTASTIC/Avengers/Thor
-LastMoveDir=/home/haron/Video/FANTASTIC/Avengers/Thor
-Folder1=/home/haron/Video/FANTASTIC/OTHER
-Folder2=/home/haron/Video
-Folder3=/home/haron/Video/FANTASTIC/Avengers
-Folder4=/home/haron/Video/Fantasy
+Folder0=/home/haron/Video/FANTASTIC/OTHER
+LastMoveDir=/home/haron/Video/FANTASTIC/OTHER
+Folder1=/home/haron/Video/Fantasy
+Folder2=/home/haron/Video/FANTASTIC/Avengers/Thor
+Folder3=/home/haron/Video
+Folder4=/home/haron/Video/FANTASTIC/Avengers
 =======
 Folder0=/home/haron/Video/tmp
 LastMoveDir=/home/haron/Video/tmp