oops, no Python 2 on master

Author: minrk

.travis.yml

@@ -72,10 +72,6 @@ matrix:
           env:
           - GROUP=python
           - EXTRA_PIP="tornado<5"
-        - python: 2.7
-          env:
-          - GROUP=python
-          - EXTRA_PIP="tornado<5"
 
 after_success:
     - codecov

jupyter_server/utils.py

@@ -395,10 +395,6 @@ def _check_pid_posix(pid):
 
 def maybe_future(obj):
     """Like tornado's gen.maybe_future
-<<<<<<< HEAD:jupyter_server/utils.py
-=======
-
->>>>>>> dcee71015... patch gen.maybe_future for compatibility with tornado 6:notebook/utils.py
     but more compatible with asyncio for recent versions
     of tornado
     """
@@ -424,7 +420,3 @@ def maybe_future(obj):
 else:
     import tornado.gen
     tornado.gen.maybe_future = maybe_future
-<<<<<<< HEAD:jupyter_server/utils.py
-=======
-
->>>>>>> dcee71015... patch gen.maybe_future for compatibility with tornado 6:notebook/utils.py