Fix merge conflicts

Jaipreet Singh · Jaipreet Singh · commit 1919468b284b · 2019-07-31T14:13:00.000-07:00
diff --git a/src/components/FileList.tsx b/src/components/FileList.tsx
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { Dialog, showDialog } from '@jupyterlab/apputils';
 
 import { JupyterFrontEnd } from '@jupyterlab/application';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`import { Dialog, showDialog } from '@jupyterlab/apputils';`
`3`	`2`
`4`	`3`	`import { JupyterFrontEnd } from '@jupyterlab/application';`