EPD BUG.

Venus/Venus_RT/Devices/EPD/EPDClient.cs

@@ -38,11 +38,6 @@ namespace Venus_RT.Devices.EPD
         private List<string> _cfgFileList;
         public override List<string> CFGFileList { get { return _cfgFileList; }  }
 
-<<<<<<< HEAD
-        //public new string Module { get; set; }
-        //public new string Name { get; set; }
-=======
->>>>>>> e736cfa... EPD
         public string EPDVersion { get; private set; }
         public string EPDState { get; private set; }
         public string SensorStatus { get; private set; }