fix conflict

1 files changed, 14 insertions, 0 deletions

diff --git a/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/ViewModels/LoadingView.cs b/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/ViewModels/LoadingView.cs
new file mode 100644
index 000000000..c1c9d1bb4
--- /dev/null
+++ b/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/ViewModels/LoadingView.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.SharedUI;
+
+namespace Tango.PanelPC.UI.ViewModels
+{
+    public class LoadingView : ViewModel
+    {
+
+    }
+}