lint

Author: brichet

packages/jupyterlab-chat/src/factory.ts

@@ -11,7 +11,7 @@ import {
   IInputToolbarRegistry,
   IMessageFooterRegistry,
   ISelectionWatcher,
-  IInputToolbarRegistryFactory
+  IInputToolbarRegistryFactory,
   WriterComponent
 } from '@jupyter/chat';
 import { IThemeManager } from '@jupyterlab/apputils';

packages/jupyterlab-chat/src/widget.tsx

@@ -3,23 +3,7 @@
  * Distributed under the terms of the Modified BSD License.
  */
 
-<<<<<<< HEAD
 import { ChatWidget, IChatModel } from '@jupyter/chat';
-=======
-import {
-  ChatWidget,
-  IAttachmentOpenerRegistry,
-  IChatCommandRegistry,
-  IChatModel,
-  IInputToolbarRegistry,
-  IMessageFooterRegistry,
-  readIcon,
-  WriterComponent
-} from '@jupyter/chat';
-import { Contents } from '@jupyterlab/services';
-import { IThemeManager } from '@jupyterlab/apputils';
-import { PathExt } from '@jupyterlab/coreutils';
->>>>>>> 04982b7 (Add the writer component plugin to alow third party extension to provide it)
 import { DocumentWidget } from '@jupyterlab/docregistry';
 
 import { LabChatModel } from './model';

ui-tests/tests/typing-notification.spec.ts

@@ -11,12 +11,7 @@ import {
 } from '@jupyterlab/galata';
 import { User } from '@jupyterlab/services';
 
-import {
-  openChat,
-  openSettings,
-  sendMessage,
-  USER
-} from './test-utils';
+import { openChat, openSettings, sendMessage, USER } from './test-utils';
 
 const FILENAME = 'my-chat.chat';