fix merge

2016-04-07 09:22:15 -04:00 · 2016-04-07 09:22:15 -04:00 · 9114f1e357
parent e1cbaed2a3
commit 9114f1e357
1 changed files with 0 additions and 8 deletions
--- a/8
+++ b/8
@ -1,9 +1 @@
-<<<<<<< HEAD
 1.30.2
-=======
-<<<<<<< HEAD
-1.30.0
-=======
-1.29.1
->>>>>>> master
->>>>>>> icon_video