浏览代码

Remove merge marker

Steven Silvester 7 年之前
父节点
当前提交
78369e975e
共有 1 个文件被更改,包括 0 次插入1 次删除
  1. 0 1
      setupbase.py

+ 0 - 1
setupbase.py

@@ -154,7 +154,6 @@ def ensure_core_data(command):
     return DecoratedCommand
 
 
->>>>>>> fcfcecec0... Remove fallback mode by creating an app directory on install
 def js_prerelease(command, strict=False):
     """decorator for building minified js/css prior to another command"""
     class DecoratedCommand(command):