Skip to content

Commit

Permalink
Merge branch 'feature/8221_schema_version' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	Code/Mantid/instrument/BASIS_Definition_0-20130719.xml

refs #8221
  • Loading branch information
stuartcampbell committed Oct 29, 2013
2 parents 8544a82 + 3db2640 commit 44b184d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Code/Mantid/instrument/BASIS_Definition_0-20130719.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<instrument valid-to="2013-07-18 23:59:59" name="BASIS" valid-from="1900-08-02 16:09:00">
<instrument xmlns="http://www.mantidproject.org/IDF/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 Schema/IDFSchema.xsd"
valid-to="2013-07-18 23:59:59" name="BASIS" valid-from="1900-08-02 16:09:00">
<!-- Created by Stuart Campbell -->
<defaults>
<length unit="metre"/>
Expand Down

0 comments on commit 44b184d

Please sign in to comment.