Changeset ffbf35ee in sasview


Ignore:
Timestamp:
Nov 13, 2018 2:54:20 PM (4 weeks ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
ticket-1094-headless
Children:
880abb6
Parents:
1580cc3
Message:

resolve merge issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • run.py

    r1580cc3 rffbf35ee  
    111111    #addpath(os.path.join(root, '..','wxPython-src-3.0.0.0','wxPython')) 
    112112 
    113 <<<<<<< HEAD 
    114     # Build project if the build directory does not already exist. 
    115     # PAK: with "update" we can always build since it is fast 
    116     if rebuild or not os.path.exists(build_path): 
    117 ======= 
    118113    # Put the sas source tree on the path 
    119114    addpath(joinpath(root, 'src')) 
     
    132127    # Build C extensions if necessary.  Do an inplace build to simplify path. 
    133128    if rebuild: 
    134 >>>>>>> master 
    135129        import subprocess 
    136130        build_cmd = [sys.executable, "setup.py", "build_ext", "--inplace", "update"] 
Note: See TracChangeset for help on using the changeset viewer.