fixed conflicts

1 files changed, 13 insertions, 25 deletions

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>