fixed conflicts

2 files changed, 17 insertions, 44 deletions

diff --git a/app/assets/javascripts/deploy_keys/components/key.vue b/app/assets/javascripts/deploy_keys/components/key.vue
index 8211ba280c5..843564ce016 100644
--- a/app/assets/javascripts/deploy_keys/components/key.vue
+++ b/app/assets/javascripts/deploy_keys/components/key.vue
@@ -1,15 +1,15 @@
 <script>
   import actionBtn from './action_btn.vue';
-<<<<<<< HEAD
   import { getTimeago } from '../../lib/utils/datetime_utility';
-=======
   import tooltip from '../../vue_shared/directives/tooltip';
->>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
 
   export default {
     components: {
       actionBtn,
     },
+    directives: {
+      tooltip,
+    },
     props: {
       deployKey: {
         type: Object,
@@ -24,15 +24,6 @@
         required: true,
       },
     },
-<<<<<<< HEAD
-=======
-    directives: {
-      tooltip,
-    },
-    components: {
-      actionBtn,
-    },
->>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
     computed: {
       timeagoDate() {
         return getTimeago().format(this.deployKey.created_at);
@@ -71,18 +62,12 @@
     </div>
     <div class="deploy-key-content prepend-left-default deploy-key-projects">
       <a
-<<<<<<< HEAD
-        v-for="(project, i) in deployKey.projects"
-        class="label deploy-project-label"
-        :href="project.full_path"
+        v-for="(deployKeysProject, i) in deployKey.deploy_keys_projects"
         :key="i"
-=======
-        v-for="deployKeysProject in deployKey.deploy_keys_projects"
         class="label deploy-project-label"
         :href="deployKeysProject.project.full_path"
         :title="tooltipTitle(deployKeysProject)"
         v-tooltip
->>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
       >
         {{ deployKeysProject.project.full_name }}
         <i
diff --git a/app/assets/javascripts/notebook/cells/output/html.vue b/app/assets/javascripts/notebook/cells/output/html.vue
index ed4695a4eb8..0535ee7afa8 100644
--- a/app/assets/javascripts/notebook/cells/output/html.vue
+++ b/app/assets/javascripts/notebook/cells/output/html.vue
@@ -1,42 +1,30 @@
 <script>
-<<<<<<< HEAD
+  import sanitize from 'sanitize-html';
   import Prompt from '../prompt.vue';
-=======
-import sanitize from 'sanitize-html';
-import Prompt from '../prompt.vue';
->>>>>>> Merge branch 'fl-ipythin-10-3' into 'security-10-3'
 
   export default {
     components: {
       prompt: Prompt,
     },
-<<<<<<< HEAD
     props: {
       rawCode: {
         type: String,
         required: true,
       },
     },
-  };
-=======
-  },
-  components: {
-    prompt: Prompt,
-  },
-  computed: {
-    sanitizedOutput() {
-      return sanitize(this.rawCode, {
-        allowedTags: sanitize.defaults.allowedTags.concat([
-          'img', 'svg',
-        ]),
-        allowedAttributes: {
-          img: ['src'],
-        },
-      });
+    computed: {
+      sanitizedOutput() {
+        return sanitize(this.rawCode, {
+          allowedTags: sanitize.defaults.allowedTags.concat([
+            'img', 'svg',
+          ]),
+          allowedAttributes: {
+            img: ['src'],
+          },
+        });
+      },
     },
-  },
-};
->>>>>>> Merge branch 'fl-ipythin-10-3' into 'security-10-3'
+  };
 </script>
 
 <template>