Correct info.opi and update version numbers

Author: John-Holt-Tessella

base/uk.ac.stfc.isis.ibex.client.product/pom.xml

@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-    <version>4.4.2-SNAPSHOT</version>
+    <version>4.4.3-SNAPSHOT</version>
   <artifactId>uk.ac.stfc.isis.ibex</artifactId>
   <packaging>eclipse-repository</packaging>
   <parent>

base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml

@@ -514,35 +514,36 @@
         <description>The OPI for the linear sample changer. No properties required.</description>
         <macros>
 		</macros>
-		</entry>
-		<entry>
-			<key>Fermi chopper - Digital Drive</key>
-			<value>
-				<categories>
-					<category>Choppers</category>
-				</categories>
-				<type>CHOPPER</type>
-				<path>FZJ_DD_Fermi_Chopper.opi</path>
-				<description>The OPI for the FZJ Digital Drive Fermi Chopper.</description>
-				<macros>
-				</macros>
-			</value>
-		</entry>  
-		<entry>
-			<key>EnginX 3rd Jaw</key>
-			<value>
-				<categories>
-					<category>Jaws and slits</category>
-				</categories>
-				<type>JAWS</type>
-				<path>jaws/enginx_jaws/jaw_overview.opi</path>
-				<description>The OPI for the 3rd Enginx Jawset.</description>
-				<macros>
-					<macro>
-						<name>J</name>
-						<description>The Jaws PV (e.g. MOT:JAWS1).</description>
-					</macro>            
-				</macros>
+      </value>
+	</entry>
+	<entry>
+	  <key>Fermi chopper - Digital Drive</key>
+	    <value>
+			<categories>
+				<category>Choppers</category>
+			</categories>
+			<type>CHOPPER</type>
+			<path>FZJ_DD_Fermi_Chopper.opi</path>
+			<description>The OPI for the FZJ Digital Drive Fermi Chopper.</description>
+			<macros>
+			</macros>
+		</value>
+	</entry>  
+	<entry>
+		<key>EnginX 3rd Jaw</key>
+		<value>
+			<categories>
+				<category>Jaws and slits</category>
+			</categories>
+			<type>JAWS</type>
+			<path>jaws/enginx_jaws/jaw_overview.opi</path>
+			<description>The OPI for the 3rd Enginx Jawset.</description>
+			<macros>
+				<macro>
+					<name>J</name>
+					<description>The Jaws PV (e.g. MOT:JAWS1).</description>
+				</macro>            
+			</macros>
       </value>
     </entry>
     <entry>
@@ -1412,7 +1413,6 @@
       </value>
     </entry>
     <entry>
-<<<<<<< HEAD
       <key>IPS</key>
       <value>
         <categories>

base/uk.ac.stfc.isis.ibex.product/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CSS ISIS
 Bundle-SymbolicName: uk.ac.stfc.isis.ibex.product;singleton:=true
-Bundle-Version: 0.0.0.qualifier
+Bundle-Version: 4.4.3.qualifier
 Bundle-Activator: uk.ac.stfc.isis.ibex.product.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

base/uk.ac.stfc.isis.ibex.product/pom.xml

@@ -8,5 +8,5 @@
   	<version>1.0.0-SNAPSHOT</version>
   	<relativePath>../uk.ac.stfc.isis.ibex.client.tycho.parent</relativePath>
   </parent>
-  <version>0.0.0-SNAPSHOT</version>
+  <version>4.4.3-SNAPSHOT</version>
 </project>