resolve merge conflict

Jared Dean · Jared Dean · commit eb829a7772c8 · 2016-09-22T18:15:58.000Z
diff --git a/setup.py b/setup.py
@@ -42,7 +42,6 @@
 
 
 class InstallWithKernelspec(install):
-
     def run(self):
         try:
             from jupyter_client.kernelspec import install_kernel_spec
