From 57313bda77276d7a5dd4a0bd3806485bd9f63d54 Mon Sep 17 00:00:00 2001
From: "cesar.schaal" <cesar.schaal@etu.unistra.fr>
Date: Tue, 30 Mar 2021 13:50:08 +0200
Subject: [PATCH] Fusion merges
---
view/Controls/TileView.cs | 2 +-
view/FormJeu.Designer.cs | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/view/Controls/TileView.cs b/view/Controls/TileView.cs
index 742dbab..f3cf19b 100644
--- a/view/Controls/TileView.cs
+++ b/view/Controls/TileView.cs
@@ -14,7 +14,7 @@ namespace Wanderer.view.Controls
Height = Width;
FlatStyle = FlatStyle.Flat;
BackColor = Color.Transparent;
- Margin.All = 0;
+
//Image = imageFromTerrain();
}
diff --git a/view/FormJeu.Designer.cs b/view/FormJeu.Designer.cs
index 45b6ed1..2bed397 100644
--- a/view/FormJeu.Designer.cs
+++ b/view/FormJeu.Designer.cs
@@ -244,11 +244,7 @@ namespace Wanderer.view
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
-<<<<<<< HEAD
- this.ClientSize = new System.Drawing.Size(1707, 862);
-=======
this.ClientSize = new System.Drawing.Size(1280, 700);
->>>>>>> 1fdc9c720a8b6d9c61adde7fbe1d4a1a81fe7b57
this.Controls.Add(this.mapView1);
this.Controls.Add(this.btnClub);
this.Controls.Add(this.btnChemin);
--
GitLab