Эх сурвалжийг харах

fix: error conflict merge

ArrayKat2 5 сар өмнө
parent
commit
326b6ec0e1

+ 1 - 3
HelloItQuantum/ViewModels/LabyrinthViewModel.cs

@@ -46,10 +46,8 @@ namespace HelloItQuantum.ViewModels
             tb.CornerRadius = new CornerRadius(10);
             tb.Margin = new Thickness(5);
             ListCommandForRobots.Children.Add(tb);
-<<<<<<< HEAD
-=======
             listContent.Add(tb.Text);
->>>>>>> newBranchK
+
         }
         
         public void DeleteCommand() {