fixed comment

2015-05-09 19:16:57 -05:00 · 2015-05-09 19:16:57 -05:00 · f88424754b
parent bcface8d4f
commit f88424754b
2 changed files with 3 additions and 5 deletions
--- 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)
  }
--- a/animate.min.css
+++ b/animate.min.css