Refs #11814 Fix merge issues

mantidproject · May 28, 2015 · 167c299 · 167c299
2 parents 191ad69 + c145bcf
commit 167c299
Show file tree

Hide file tree

Showing 328 changed files with 4,696 additions and 9,969 deletions.
diff --git a/Code/Mantid/Build/class_maker.py b/Code/Mantid/Build/class_maker.py
@@ -126,7 +126,7 @@ def write_source(subproject, classname, filename, args):
 const std::string %s::name() const { return "%s"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int %s::version() const { return 1; };
+int %s::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string %s::category() const {
@@ -136,7 +136,7 @@ def write_source(subproject, classname, filename, args):
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string %s::summary() const {
   return "TODO: FILL IN A SUMMARY";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.

diff --git a/Code/Mantid/Build/mwclient/README.txt b/Code/Mantid/Build/mwclient/README.txt
diff --git a/Code/Mantid/Build/mwclient/REFERENCE.txt b/Code/Mantid/Build/mwclient/REFERENCE.txt
diff --git a/Code/Mantid/Build/mwclient/RELEASE-NOTES.txt b/Code/Mantid/Build/mwclient/RELEASE-NOTES.txt
diff --git a/Code/Mantid/Build/mwclient/__init__.py b/Code/Mantid/Build/mwclient/__init__.py