nek0/BuecherwurmAPI
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

.gitignore-Datei berichtigt

Browse source
This commit is contained in:
Jonas Schönbach 2020-05-28 11:02:04 +02:00
parent d64c4fed67
commit 22e87cd58a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

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