change

.drone.yml

@@ -15,18 +15,7 @@ steps:
       - cd LOLAPP/
       - dotnet restore LOLAPP.sln
       - dotnet build LOLAPP.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0
-<<<<<<< HEAD
-
-=======
       
->>>>>>> 75d5a4a3eba8723843e8847e2242b0d8924654ba
-  - name: unit-tests
-    image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest
-    commands:
-      - cd LOLAPP/UniTests/
-      - dotnet restore UniTests.csproj
-      - dotnet test UniTests.csproj --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage"
-
   - name: tests
     image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest
     commands: