Merge pull request #3781 from GrpeApple/master

Remove trailing whitespace
This commit is contained in:
Brian Douglas 2021-08-17 22:54:19 -07:00 committed by GitHub
commit b0012e4930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions

View File

@ -45,7 +45,7 @@ target_wrapper.*
# QtCreator CMake # QtCreator CMake
CMakeLists.txt.user* CMakeLists.txt.user*
# QtCreator 4.8< compilation database # QtCreator 4.8< compilation database
compile_commands.json compile_commands.json
# QtCreator local machine specific files for imported projects # QtCreator local machine specific files for imported projects

View File

@ -9,8 +9,8 @@
crash.log crash.log
# Exclude all .tfvars files, which are likely to contain sentitive data, such as # Exclude all .tfvars files, which are likely to contain sentitive data, such as
# password, private keys, and other secrets. These should not be part of version # password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject # control as they are data points which are potentially sensitive and subject
# to change depending on the environment. # to change depending on the environment.
# #
*.tfvars *.tfvars

View File

@ -14,10 +14,10 @@
# Ignore Umbraco content cache file # Ignore Umbraco content cache file
**/App_Data/umbraco.config **/App_Data/umbraco.config
## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3` ## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3`
## you can find your Umbraco version in your Web.config. (i.e. <add key="Umbraco.Core.ConfigurationStatus" value="8.5.3" />) ## you can find your Umbraco version in your Web.config. (i.e. <add key="Umbraco.Core.ConfigurationStatus" value="8.5.3" />)
## Uncomment this line if you think it fits the way you work on your project. ## Uncomment this line if you think it fits the way you work on your project.
## **/[Uu]mbraco/ ## **/[Uu]mbraco/
# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
# Make sure to include details from VisualStudio.gitignore BEFORE this # Make sure to include details from VisualStudio.gitignore BEFORE this

View File

@ -10,7 +10,7 @@
*.csr *.csr
## Certificate ## Certificate
*.der *.der
## Key database file ## Key database file
*.kdb *.kdb

View File

@ -18,7 +18,7 @@
/.php_cs.cache /.php_cs.cache
/grunt-config.json /grunt-config.json
/dev/tools/grunt/configs/local-themes.js /dev/tools/grunt/configs/local-themes.js
/pub/media/*.* /pub/media/*.*
!/pub/media/.htaccess !/pub/media/.htaccess
/pub/media/attribute/* /pub/media/attribute/*
@ -45,7 +45,7 @@
!/pub/media/captcha/.htaccess !/pub/media/captcha/.htaccess
/pub/static/* /pub/static/*
!/pub/static/.htaccess !/pub/static/.htaccess
/var/* /var/*
!/var/.htaccess !/var/.htaccess
/vendor/* /vendor/*

View File

@ -11,7 +11,7 @@ EWARM/**/Obj
EWARM/**/List EWARM/**/List
EWARM/**/Exe EWARM/**/Exe
# Autogenerated project files # Autogenerated project files
*.dep *.dep
*.ewt *.ewt