rebase

microsoft · Jun 4, 2020 · 96c0157 · 96c0157
1 parent 7f35381
commit 96c0157
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Composer/packages/lib/code-editor/src/LgEditor.tsx b/Composer/packages/lib/code-editor/src/LgEditor.tsx
@@ -10,11 +10,8 @@ import { EditorDidMount } from '@monaco-editor/react';
 import { registerLGLanguage } from './languages';
 import { createUrl, createWebSocket, createLanguageClient, SendRequestWithRetry } from './utils/lspUtil';
 import { BaseEditor, BaseEditorProps, OnInit } from './BaseEditor';
-<<<<<<< HEAD
 import { LGOption } from './utils';
-=======
 import { LG_HELP } from './constants';
->>>>>>> update lg format link
 
 const placeholder = `> To learn more about the LG file format, read the documentation at
 > ${LG_HELP}`;