merge conflict in portfolio.less

OATV · Aug 29, 2017 · 791f63b · 791f63b
1 parent eb0f0de
commit 791f63b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/less/modules/portfolio.less b/less/modules/portfolio.less
@@ -9,11 +9,7 @@
         @media @mobi-v {
             padding: 100px 0 30px 0;
             background-image: url(../img/mobi-v-portfolioBG.jpg);
-<<<<<<< Updated upstream
             background-position: 0 0;
-=======
-            background-position: 0 -50px;
->>>>>>> Stashed changes
             background-size: cover;
         }
         @media @ipad-h {