.gitignore-Datei berichtigt
This commit is contained in:
parent
d64c4fed67
commit
22e87cd58a
1 changed files with 0 additions and 4 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue