解决冲突

Venus/Venus_RT/Config/System.sccfg

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root system="Venus">
-	<configs name="System" nameView="System">
-		<config default="0"    name="ChamberSelect" nameView="Select Chamber" description="0=>Venus,1=>Kepler,4=>Venus SE,5=>Venus DE" max="5" min="0" paramter="" tag="" unit="" type="Integer" visible="false"/>
+	<configs name="System" nameView="System">		
 		<config default="True" name="IsSimulatorMode" nameView="Simulator Mode" description="仿真模式" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		<config default="true" name="IsOpenIOEdit" nameView="Simulator Mode" description="RT IO修改开关" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		<config default="True" name="IsOpenDebugLog" nameView="" description="Debug Log" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>

Venus/Venus_UI/Venus_UI.csproj.user

@@ -9,6 +9,6 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>zh-CN</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>