Commits

Anonymous committed 9d86770

post-merge fixes

  • Participants
  • Parent commits d51c0a4

Comments (0)

Files changed (1)

flaskext/script.py

 # -*- coding: utf-8 -*-
-<<<<<<< local
-=======
 from __future__ import absolute_import
->>>>>>> other
 from __future__ import with_statement
 
 import sys