resolve merge-conflict

ImageSource.lvlib

@@ -14,7 +14,6 @@
 		<Item Name="tm430_functions.vi" Type="VI" URL="../ImageSourceBase/_demo/tm430_functions.vi"/>
 	</Item>
 	<Item Name="InheritBase" Type="Folder">
-		<Item Name="ImageSourceHama.lvclass" Type="LVClass" URL="../ImageSourceBase/Hama/ImageSourceHama.lvclass"/>
 		<Item Name="ImageSourceImaqdx.lvclass" Type="LVClass" URL="../ImageSourceBase/Imaqdx/ImageSourceImaqdx.lvclass"/>
 		<Item Name="ImageSourceImaqdxBasler.lvclass" Type="LVClass" URL="../ImageSourceBase/Imaqdx/Basler/ImageSourceImaqdxBasler.lvclass"/>
 		<Item Name="ImageSourceImaqdxBaslerFW.lvclass" Type="LVClass" URL="../ImageSourceBase/Imaqdx/Basler/FW/ImageSourceImaqdxBaslerFW.lvclass"/>
@@ -25,7 +24,6 @@
 		<Item Name="ImageSourceSimulationSHS.lvclass" Type="LVClass" URL="../ImageSourceBase/Simulation/SHS/ImageSourceSimulationSHS.lvclass"/>
 	</Item>
 	<Item Name="InheritConfigure" Type="Folder">
-		<Item Name="ImageSourceConfigureHama.lvclass" Type="LVClass" URL="../ImageSourceConfigure/Hama/ImageSourceConfigureHama.lvclass"/>
 		<Item Name="ImageSourceConfigureImaqdx.lvclass" Type="LVClass" URL="../ImageSourceConfigure/Imaqdx/ImageSourceConfigureImaqdx.lvclass"/>
 		<Item Name="ImageSourceConfigureImaqdxBasler.lvclass" Type="LVClass" URL="../ImageSourceConfigure/Imaqdx/Basler/ImageSourceConfigureImaqdxBasler.lvclass"/>
 		<Item Name="ImageSourceConfigureImaqdxBaslerFW.lvclass" Type="LVClass" URL="../ImageSourceConfigure/Imaqdx/Basler/FW/ImageSourceConfigureImaqdxBaslerFW.lvclass"/>

ImageSource.lvproj

@@ -57,6 +57,7 @@
 				<Item Name="Set Cursor (Cursor ID).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Cursor ID).vi"/>
 				<Item Name="Set Cursor (Icon Pict).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Icon Pict).vi"/>
 				<Item Name="Unset Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Unset Busy.vi"/>
+				<Item Name="Get LV Class Default Value By Name.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/LVClass/Get LV Class Default Value By Name.vi"/>
 			</Item>
 			<Item Name="lvanlys.dll" Type="Document" URL="/&lt;resource&gt;/lvanlys.dll"/>
 			<Item Name="niimaqdx.dll" Type="Document" URL="niimaqdx.dll">
@@ -70,6 +71,7 @@
 			</Item>
 			<Item Name="ZernikePolynomes.lvlib" Type="Library" URL="../../zernikepolynome/ZernikePolynomes.lvlib"/>
 			<Item Name="HamamatsuDriver.lvlib" Type="Library" URL="../../hamamatsudriver/HamamatsuDriver.lvlib"/>
+			<Item Name="ImageSourceConfigureHama.lvclass" Type="LVClass" URL="../ImageSourceConfigure/Hama/ImageSourceConfigureHama.lvclass"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build"/>
 	</Item>