From aed9c618049e16a2f356fe8f20cc8258621a6553 Mon Sep 17 00:00:00 2001 From: QiTao Weng Date: Sun, 10 Apr 2022 03:01:01 -0500 Subject: [PATCH] =?UTF-8?q?Oops,=20left=20a=20merge=20conflict=20in=20ther?= =?UTF-8?q?e=20=F0=9F=98=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Editor.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/pages/Editor.vue b/src/pages/Editor.vue index 926c70e..12ae705 100644 --- a/src/pages/Editor.vue +++ b/src/pages/Editor.vue @@ -8,17 +8,12 @@ import Statement from '../components/Statement.vue' import VarDeclEditor from '../components/VarDeclEditor.vue' import ExpressionEditor from '../components/ExpressionEditor.vue' import TextBox from '../components/TextBox.vue' -<<<<<<< HEAD import ImageBox from '../components/ImageBox.vue' import FunctionEditor from '../components/FunctionEditor.vue' import { RichTextBox, ImageContainer } from '../support/types' -======= -import FunctionEditor from '../components/FunctionEditor.vue' import RangeChart from '../components/RangeChart.vue' import RangeChartEditor from './RangeChartEditor.vue' -import { RichTextBox } from '../support/types' ->>>>>>> 17a6aea76db7a943a190d4db6524e6b16c01392e import { stepX, stepY } from '../support/const' import { checkLoggedIn, loggedOut } from '../support/auth' import router from '../router'