Browse Source

Update .gitignore

parent
commit
de4a7cb943
1 changed files with 17 additions and 0 deletions
  1. 17
    0
      .gitignore

+ 17
- 0
.gitignore View File

@@ -6,5 +6,22 @@ composer.lock
6 6
 .env.php
7 7
 .DS_Store
8 8
 Thumbs.db
9
+<<<<<<< Updated upstream
9 10
 app/database/csv/*
10 11
 app/config/local/*
12
+=======
13
+
14
+
15
+app/storage/annual_pdfs/*
16
+public/exports/*
17
+
18
+node_modules/
19
+vendor/*
20
+!vendor/barryvdh/
21
+!vendor/dompdf/
22
+
23
+app/controllers/AuthController.php
24
+app/controllers/AuthController.php
25
+bootstrap/start.php
26
+testdisk.log
27
+>>>>>>> Stashed changes