From 0f7459a71f1fcf5fc13d097702de293d2061010d Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Tue, 16 May 2023 16:59:35 +0200
Subject: [PATCH] conflict's resolution caused by switching branch too fast
 without saving

---
 MCTG/Model/Ingredient.cs                          | 13 +++++++++++++
 MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 MCTG/Model/Ingredient.cs

diff --git a/MCTG/Model/Ingredient.cs b/MCTG/Model/Ingredient.cs
new file mode 100644
index 0000000..986444c
--- /dev/null
+++ b/MCTG/Model/Ingredient.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    internal class Ingredient
+    {
+
+    }
+}
diff --git a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
index dc31a95..99f0f2e 100644
--- a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
+++ b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>