From cf14306c2b3f82a81f8d56669a71633b4d4b5fce Mon Sep 17 00:00:00 2001
From: marvin-borner@live.com
Date: Mon, 16 Apr 2018 21:09:05 +0200
Subject: Main merge to user management system - files are now at /main/public/

---
 .gitignore | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index cbc6077..71c0b24 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,21 @@
-assets/php/DataBaseConf.php
-login/app/.env
-login/composer.lock
-login/composer.phar
-login/app/cache/*
-login/app/logs/*
-login/app/sessions/*
-!login/app/cache/.gitkeep
-!login/app/logs/.gitkeep
-!login/app/sessions/.gitkeep
-login/app/sprinkles/*/assets/vendor/
-login/app/sprinkles.json
-login/app/sprinkles/site-dev
-login/app/vendor/*
-login/build/node_modules/*
-login/build/bundle.config.json
-login/build/bundle.result.json
-login/build/temp
-login/build/npm-debug.log
-login/app/config-userfrosting.php
-login/app/database/userfrosting.db
\ No newline at end of file
+main/app/sprinkles/core/assets/SiteAssets/php/DataBaseConf.php
+main/app/.env
+main/composer.lock
+main/composer.phar
+main/app/cache/*
+main/app/logs/*
+main/app/sessions/*
+!main/app/cache/.gitkeep
+!main/app/logs/.gitkeep
+!main/app/sessions/.gitkeep
+main/app/sprinkles/*/assets/vendor/
+main/app/sprinkles.json
+main/app/sprinkles/site-dev
+main/app/vendor/*
+main/build/node_modules/*
+main/build/bundle.config.json
+main/build/bundle.result.json
+main/build/temp
+main/build/npm-debug.log
+main/app/config-userfrosting.php
+main/app/database/userfrosting.db
\ No newline at end of file
-- 
cgit v1.2.3