Merge branch 'master' into patch-1

This commit is contained in:
Brendan Forster 2018-06-17 15:27:35 -03:00 committed by GitHub
commit 53e8b617ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 54 additions and 26 deletions

View File

@ -3,7 +3,6 @@
# Files and directories created by pub # Files and directories created by pub
.dart_tool/ .dart_tool/
.packages .packages
.pub/
build/ build/
# If you're building an application, you may want to check-in your pubspec.lock # If you're building an application, you may want to check-in your pubspec.lock
pubspec.lock pubspec.lock
@ -11,3 +10,12 @@ pubspec.lock
# Directory created by dartdoc # Directory created by dartdoc
# If you don't generate documentation locally you can remove this line. # If you don't generate documentation locally you can remove this line.
doc/api/ doc/api/
# Avoid committing generated Javascript files:
*.dart.js
*.info.json # Produced by the --dump-info flag.
*.js # When generated by dart2js. Don't specify *.js if your
# project includes source files written in JavaScript.
*.js_
*.js.deps
*.js.map

View File

@ -4,6 +4,7 @@
# User-specific stuff # User-specific stuff
.idea/**/workspace.xml .idea/**/workspace.xml
.idea/**/tasks.xml .idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries .idea/**/dictionaries
.idea/**/shelf .idea/**/shelf
@ -14,6 +15,7 @@
.idea/**/sqlDataSources.xml .idea/**/sqlDataSources.xml
.idea/**/dynamic.xml .idea/**/dynamic.xml
.idea/**/uiDesigner.xml .idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle # Gradle
.idea/**/gradle.xml .idea/**/gradle.xml

View File

@ -14,3 +14,4 @@
# Metadata # Metadata
*.aliases *.aliases
*.lvlps *.lvlps
.cache/

View File

@ -62,3 +62,9 @@ typings/
# nuxt.js build output # nuxt.js build output
.nuxt .nuxt
# vuepress build output
.vuepress/dist
# Serverless directories
.serverless

View File

@ -1,2 +1,4 @@
.sass-cache/ .sass-cache/
*.css.map *.css.map
*.sass.map
*.scss.map

View File

@ -40,6 +40,10 @@
*.synctex.gz(busy) *.synctex.gz(busy)
*.pdfsync *.pdfsync
## Build tool directories for auxiliary files
# latexrun
latex.out/
## Auxiliary and intermediate files from other packages: ## Auxiliary and intermediate files from other packages:
# algorithms # algorithms
*.alg *.alg

View File

@ -1,9 +1,15 @@
# Local .terraform directories # Local .terraform directories
**/.terraform/* **/.terraform/*
# .tfstate files # .tfstate files
*.tfstate *.tfstate
*.tfstate.* *.tfstate.*
# .tfvars files # Crash log files
*.tfvars crash.log
# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
# .tfvars files are managed as part of configuration and so should be included in
# version control.
#
# example.tfvars

View File

@ -52,7 +52,6 @@ BenchmarkDotNet.Artifacts/
project.lock.json project.lock.json
project.fragment.lock.json project.fragment.lock.json
artifacts/ artifacts/
**/Properties/launchSettings.json
# StyleCop # StyleCop
StyleCopReport.xml StyleCopReport.xml