Skip to content

Commit

Permalink
re #6669 fix merge conflict in cmakelists
Browse files Browse the repository at this point in the history
  • Loading branch information
NickDraper committed May 16, 2013
2 parents 5c66ab3 + 4186269 commit 1336079
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set ( TEST_PY_FILES
CreateWorkspaceTest.py
DakotaChiSquaredTest.py
FindReflectometryLinesTest.py
LoadFullprofFileTest.py
LoadLogPropertyTableTest.py
MaskWorkspaceToCalFileTest.py
MergeCalFilesTest.py
RetrieveRunInfoTest.py
Expand Down

0 comments on commit 1336079

Please sign in to comment.