From e8dd8b5055d3967c7ea27993237d736995345ffe Mon Sep 17 00:00:00 2001 From: Adam Rusinowski Date: Sat, 12 Aug 2023 15:54:12 +0200 Subject: [PATCH] reverted .editorconfig and .gitignore changes --- .editorconfig | 21 ++++++++++----------- .gitignore | 35 +++-------------------------------- 2 files changed, 13 insertions(+), 43 deletions(-) diff --git a/.editorconfig b/.editorconfig index f7e2a69..13d94df 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,21 +1,20 @@ -# This file is for unifying the coding style for different editors and IDEs -# editorconfig.org +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org -root = true +root = false [*] -end_of_line = lf -charset = utf-8 indent_style = space indent_size = 4 +charset = "utf-8" +end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -[*.neon] -indent_style = tab - -[phars.xml] +[*.yml] +indent_style = space indent_size = 2 -[*.js] -indent_size = 2 +[*.neon] +indent_style = tab +indent_size = 4 diff --git a/.gitignore b/.gitignore index 6ed876f..2e8ba9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,6 @@ *.pyc docs/_build +phpunit.xml +vendor/ +composer.lock tmp -/composer.lock -*.diff -*.err -*.log -*.orig -*.rej -*.swo -*.swp -*.vi -*~ -.idea/* -nbproject/* -.vscode -.DS_Store -.cache -.phpunit.cache -.project -.settings -.svn -errors.err -tags -node_modules -package-lock.json -/.phpunit.result.cache -/nbproject/ -/tools -/vendor -/phpunit.xml -/webroot/css/style.css.map -/webroot/mix.js.map -/webroot/mix-manifest.json -.ddev/*