Fix scss

Ilhasoft · Sep 20, 2018 · 89b0a5d · 89b0a5d
1 parent 4a79af3
commit 89b0a5d
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/src/components/repository/RepositoryInfo.vue b/src/components/repository/RepositoryInfo.vue
@@ -80,23 +80,6 @@ export default {
 @import '~@/bh/assets/scss/variables.scss';
 @import '~@/bh/assets/scss/colors.scss';
 
-<<<<<<< HEAD
-=======
-.repository {
-  &-infospace {
-    margin-bottom: .5rem;
-
-    &-flags {
-      $margin: .25rem;
-
-      margin: -($margin);
-
-      &-item {
-        margin: $margin;
-      }
-    }
-  }
->>>>>>> 069429b2252b0d021188ac5e6a803ce483edd5f3
 
 .repository-info {
   &__big-badge-wrapper {