Commit de6b5315 authored by Daniel Eden's avatar Daniel Eden
Browse files

Resolve merge conflicts


Co-Authored-By: default avatargianjohansen <gian.johansen@gmail.com>
parent 611b8cc9
......@@ -2226,13 +2226,11 @@
80% {
-webkit-transform: skewX(-5deg);
transform: skewX(-5deg);
opacity: 1;
}
to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
opacity: 1;
}
}
......@@ -2252,13 +2250,11 @@
80% {
-webkit-transform: skewX(-5deg);
transform: skewX(-5deg);
opacity: 1;
}
to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
opacity: 1;
}
}
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment