fixed comment

gyulaafodorr · May 12, 2015 · f884247 · f884247
1 parent bcface8
commit f884247
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/animate.css b/animate.css
@@ -529,11 +529,9 @@ Copyright (c) 2015 Daniel Eden
     -webkit-transform: none;
             transform: none
   }
-<<<<<<< HEAD
+
   22.2% {
-=======
-  30% {
->>>>>>> redid jello.css
+
     -webkit-transform: skewX(-12.5deg) skewY(-12.5deg);
             transform: skewX(-12.5deg) skewY(-12.5deg)
   }