Commit d321d182 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

removed double import of jquery js

3 merge requests!31Prepare prdoucton,!16Mlab 167,!6Devel
This commit is part of merge request !31. Comments created here will be created in the context of that merge request.
Showing with 145 additions and 117 deletions
+145 -117
......@@ -16,13 +16,13 @@ module.exports = {
}
},
database: {
//host: 'transfer.hft-stuttgart.de', // DB host
host: 'transfer.hft-stuttgart.de', // DB host
user: 'DBManager', // DB username
password: 'Stuttgart2019', // DB password
port: 3306, // MySQL port
dbUser: 'userdb', // User DB
//host_project: 'm4lab.hft-stuttgart.de', // DB host project db
host_project: 'localhost', // local
host_project: 'm4lab.hft-stuttgart.de', // DB host project db
//host_project: 'localhost', // local
dbProject: 'projectDB' // Project DB
},
mailer: {
......
This diff is collapsed.
......@@ -41,7 +41,6 @@ html(lang="de")
// jQuery
script(src="https://code.jquery.com/jquery-3.3.1.min.js")
script(src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
......@@ -50,4 +49,4 @@ html(lang="de")
script(src="/js/headfootLogout.js")
else
script(src="/js/headfoot.js")
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment