From afc94fd698f203dc27808aaa722dca6f17bf2469 Mon Sep 17 00:00:00 2001
From: Michele <michele.scandura@outlook.com>
Date: Thu, 4 Feb 2021 10:02:53 +0000
Subject: [PATCH] fix stash conflicty

---
 Sledgemapper.Api/db/LocalDatabase.db    | Bin 20480 -> 20480 bytes
 Sledgemapper.Api/db/sledgemapper.db     | Bin 40960 -> 40960 bytes
 Sledgemapper/UI/MainWidget.Generated.cs |   9 ++++++++-
 Sledgemapper/UI/mainwidget.xml          |   3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Sledgemapper.Api/db/LocalDatabase.db b/Sledgemapper.Api/db/LocalDatabase.db
index 22b8623b6d6a4c96d001c3bfc7c6179d7a5b57f0..29abb4332cafe77fabe12c434db60d37a26dd63e 100644
GIT binary patch
delta 243
zcmV<P01W?tpaFoO0k8xx3Ih#|01qz?UJZ@25fFb3e}PT|3IGoe4-bJ1f(&6{VPSE{
z<GwdNgjc|hDQ@0cnP0ZIdSUwH#fO1XySWdH7VMA2mIp{8*pt?Lx!gZE=}L^;)V{kN
z*|}{Xv8@WUtiFmMvW1)33ptSUtYQz_pQ}4W;bcdov%2{bHK`Ynk`T3kA|g<QonVy9
z3p!FjQm5>H$ngi>AEkUk;?SSFy+_KGeof${AHa;ucqJQm42Xqo(Z>lhGh)Fv7r9Hb
tT<kfU+WX0I^GNKoI~EuZstF(?Y7+~})y1Xe9aGqNT0ft&UOu4_0RvO3Zg>Cy

delta 30
lcmZozz}T>WaRZA12NPc$1HV3B+-5<6Aim9Ub_)d=nE-wJ2Y&zn

diff --git a/Sledgemapper.Api/db/sledgemapper.db b/Sledgemapper.Api/db/sledgemapper.db
index 3991092d72fb7e356729169aaf303d3ec6fc53b3..6e140107bce9584788016802be9bacb6d5018fb3 100644
GIT binary patch
literal 40960
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
U0uX=z1Rwx`Eg+!X_<LFQe^J(c3jhEB

delta 281
zcmZoTz|?SnX#<M@4-5Aa2EOOKmw9$`FWD@pFok>b66qusuDwkBd-)&ozvsWYS<qlD
zzpoG@vnFF`acYrseqLT`a!F=>9uort0}B@mvm~Q$Vu4S7Itv#QvovRLYH=}8l7WGr
znOT_;$^&U+;svT_<p06I|6{XYz&m~sHbxc(e#S(wID-IC!)N}_K$%zkT)do|K(*|g
zj7*yXI0cxG^B)H~VjutHQ~C0WOaV?M!GU>6mJ#tK?g4>LMTP0kS$Tn6V8eei@c#xH
p@t$88=rm@2&P0$f*zE88-@&#DaYCF86aNO*@RpyQ3nb3U1OVNNMk@dS

diff --git a/Sledgemapper/UI/MainWidget.Generated.cs b/Sledgemapper/UI/MainWidget.Generated.cs
index f7c1c35..59bb4d9 100644
--- a/Sledgemapper/UI/MainWidget.Generated.cs
+++ b/Sledgemapper/UI/MainWidget.Generated.cs
@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 03/02/2021 21:43:01 */
+/* Generated by MyraPad at 04/02/2021 10:02:37 */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;
@@ -191,6 +191,11 @@ namespace Sledgemapper.UI
 			});
 			verticalStackPanel1.Widgets.Add(scrollViewer1);
 
+			TxtOverlaySearch = new TextBox();
+			TxtOverlaySearch.MinHeight = 40;
+			TxtOverlaySearch.Margin = new Thickness(0, 4);
+			TxtOverlaySearch.Id = "TxtOverlaySearch";
+
 			GridOverlays = new Grid();
 			GridOverlays.ColumnSpacing = 8;
 			GridOverlays.RowSpacing = 8;
@@ -214,6 +219,7 @@ namespace Sledgemapper.UI
 			{
 				Type = Myra.Graphics2D.UI.ProportionType.Fill,
 			});
+			verticalStackPanel2.Widgets.Add(TxtOverlaySearch);
 			verticalStackPanel2.Widgets.Add(scrollViewer2);
 
 			var verticalSplitPane1 = new VerticalSplitPane();
@@ -307,6 +313,7 @@ namespace Sledgemapper.UI
 		public ImageTextButton BtnToolbarDelete;
 		public HorizontalStackPanel Toolbar;
 		public Grid GridWalls;
+		public TextBox TxtOverlaySearch;
 		public Grid GridOverlays;
 		public Label lblConnectionStatus;
 		public Label lblUsername;
diff --git a/Sledgemapper/UI/mainwidget.xml b/Sledgemapper/UI/mainwidget.xml
index 69d34c9..53e84c3 100644
--- a/Sledgemapper/UI/mainwidget.xml
+++ b/Sledgemapper/UI/mainwidget.xml
@@ -56,6 +56,9 @@
         <VerticalStackPanel.Proportions>
           <Proportion Type="Fill" />
         </VerticalStackPanel.Proportions>
+        <TextBox MinHeight="40" Margin="0, 4" >
+  
+          </TextBox>
         <ScrollViewer>
           <Grid ColumnSpacing="8" RowSpacing="8" Id="GridOverlays">
             <Grid.DefaultColumnProportion Type="Pixels" Value="40" />