updating to resolve git conflicts

2023-03-09 13:08:18 -07:00
parent d21eb055d3 7370a1e7e2
commit 53571362b7
11 changed files with 991 additions and 332 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 ### Project Specific
 # Files
+env.php
 phpcs.xml
 phpunit.xml
 .phpunit.result.cache
@ -11,8 +12,8 @@ cache/

 ### Editor Specific
 # Files
-nmsp-plugin-name.sublime-project
-nmsp-plugin-name.sublime-workspace
+/*.sublime-project
+/*.sublime-workspace

 # Directories
 /.fleet