From 69d187d3615946254ac097cd42e8bbf01d7958eb Mon Sep 17 00:00:00 2001
From: Anastasia-Sin <anastasiasinelnikova55@gmail.com>
Date: Thu, 21 Mar 2024 11:04:47 +0400
Subject: [PATCH 1/2] lab1 done

---
 ProjectCruiser/DirectionType.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ProjectCruiser/DirectionType.cs b/ProjectCruiser/DirectionType.cs
index 5d71959..93eb897 100644
--- a/ProjectCruiser/DirectionType.cs
+++ b/ProjectCruiser/DirectionType.cs
@@ -8,14 +8,17 @@ public enum DirectionType
 	/// Ââåðõ
 	/// </summary>
 	Up = 1,
+
 	/// <summary>
 	/// Âíèç
 	/// </summary>
 	Down = 2,
+
 	/// <summary>
 	/// Âëåâî
 	/// </summary>
 	Left = 3,
+
 	/// <summary>
 	/// Âïðàâî
 	/// </summary>
-- 
2.25.1


From 7e7e6123adf21850e577d329f4e41a206dbbc46d Mon Sep 17 00:00:00 2001
From: Anastasia-Sin <anastasiasinelnikova55@gmail.com>
Date: Thu, 21 Mar 2024 11:07:23 +0400
Subject: [PATCH 2/2] fix conflict

---
 ProjectCruiser/DirectionType.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ProjectCruiser/DirectionType.cs b/ProjectCruiser/DirectionType.cs
index 93eb897..5d71959 100644
--- a/ProjectCruiser/DirectionType.cs
+++ b/ProjectCruiser/DirectionType.cs
@@ -8,17 +8,14 @@ public enum DirectionType
 	/// Ââåðõ
 	/// </summary>
 	Up = 1,
-
 	/// <summary>
 	/// Âíèç
 	/// </summary>
 	Down = 2,
-
 	/// <summary>
 	/// Âëåâî
 	/// </summary>
 	Left = 3,
-
 	/// <summary>
 	/// Âïðàâî
 	/// </summary>
-- 
2.25.1