Fix conflicts

spec-first · Apr 4, 2017 · a64f46a · a64f46a
1 parent 67d4ddb
commit a64f46a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tests/fakeapi/hello.py b/tests/fakeapi/hello.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-from connexion import NoContent, ProblemException, problem
 from flask import jsonify, redirect
 
+from connexion import NoContent, ProblemException, problem
+
 
 class DummyClass(object):
     @classmethod