Changeset ffbf35ee in sasview

Timestamp:

Nov 13, 2018 2:54:20 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1094-headless

Children:

cb44d66

Parents:

1580cc3

Message:

resolve merge issues

File:

• run.py (modified) (2 diffs)

run.py

@@ -111 +111 @@
     #addpath(os.path.join(root, '..','wxPython-src-3.0.0.0','wxPython'))
 
-<<<<<<< HEAD
-    # Build project if the build directory does not already exist.
-    # PAK: with "update" we can always build since it is fast
-    if rebuild or not os.path.exists(build_path):
-=======
     # Put the sas source tree on the path
     addpath(joinpath(root, 'src'))
@@ -132 +127 @@
     # Build C extensions if necessary.  Do an inplace build to simplify path.
     if rebuild:
->>>>>>> master
         import subprocess
         build_cmd = [sys.executable, "setup.py", "build_ext", "--inplace", "update"]