From 8006b82d4d6e3ef342bb9839fd1ade0d3b286b10 Mon Sep 17 00:00:00 2001
From: Roxane ROSSETTO <rorossetto>
Date: Tue, 16 May 2023 17:00:34 +0200
Subject: [PATCH] conflict resolution

---
 MCTG/Model/Model.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MCTG/Model/Model.csproj b/MCTG/Model/Model.csproj
index fd3452d..97854fe 100644
--- a/MCTG/Model/Model.csproj
+++ b/MCTG/Model/Model.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>