resolve conflict in `app/assets/javascripts/jobs/components/sidebar_details_block.vue`

530f2cda · Lukas Eipert · 0b75b130 · 530f2cda
Commit 530f2cda authored May 26, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

app/assets/javascripts/jobs/components/sidebar_details_block.vue ...ets/javascripts/jobs/components/sidebar_details_block.vue +1 -7

No files found.
--- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
@@ -104,13 +104,7 @@ export default {
      <button
        type="button"
        :aria-label="__('Toggle Sidebar')"
-<<<<<<< HEAD
-        class="btn btn-blank gutter-toggle float-right
-          d-block d-md-none js-sidebar-build-toggle"
-=======
-        class="btn btn-blank gutter-toggle pull-right
-          d-block d-sm-block d-md-none js-sidebar-build-toggle"
->>>>>>> gitlab-ce/master
+        class="btn btn-blank gutter-toggle float-right d-block d-md-none js-sidebar-build-toggle"
      >
        <i
          aria-hidden="true"