diff --git a/.gitignore b/.gitignore index ec1b020..ae426e7 100644 --- a/.gitignore +++ b/.gitignore @@ -586,7 +586,6 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser -<<<<<<< HEAD ### VisualStudioCode ### .vscode/* !.vscode/settings.json @@ -781,7 +780,4 @@ $RECYCLE.BIN/ # Backup folder for Package Reference Convert tool in Visual Studio 2017 # End of https://www.gitignore.io/api/git,rider,linux,csharp,windows,dotnetcore,aspnetcore,visualstudio,visualstudiocode -======= -# End of https://www.gitignore.io/api/git,rider,linux,csharp,aspnetcore ->>>>>>> ControllerJonas