Resolve merge conflicts

Co-Authored-By: gianjohansen <gian.johansen@gmail.com>
This commit is contained in:
Daniel Eden 2018-07-21 07:25:45 -07:00
parent 611b8cc98b
commit de6b531570
2 changed files with 1 additions and 5 deletions

4
animate.css vendored
View file

@ -2226,13 +2226,11 @@
80% { 80% {
-webkit-transform: skewX(-5deg); -webkit-transform: skewX(-5deg);
transform: skewX(-5deg); transform: skewX(-5deg);
opacity: 1;
} }
to { to {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
opacity: 1;
} }
} }
@ -2252,13 +2250,11 @@
80% { 80% {
-webkit-transform: skewX(-5deg); -webkit-transform: skewX(-5deg);
transform: skewX(-5deg); transform: skewX(-5deg);
opacity: 1;
} }
to { to {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
opacity: 1;
} }
} }

2
animate.min.css vendored

File diff suppressed because one or more lines are too long