diff options
| author | robertkj <joramo40@hotmail.com> | 2013-04-26 09:16:03 +0200 |
|---|---|---|
| committer | robertkj <joramo40@hotmail.com> | 2013-04-26 09:16:03 +0200 |
| commit | bfc56f2cc5c0c2b3d4e19fd230b52af91ca97781 (patch) | |
| tree | f7b14d442bcde5ab3cc9219c4fc58f7f7d501472 | |
| parent | Fixed divid home placements, added text, styled and added pictures (diff) | |
| download | Divid-bfc56f2cc5c0c2b3d4e19fd230b52af91ca97781.tar.gz | |
fixed bug
| -rw-r--r-- | app.js | 2 | ||||
| -rw-r--r-- | views/header.ejs | 6 |
2 files changed, 2 insertions, 6 deletions
@@ -17,7 +17,7 @@ var app = express(); // initiates express app.configure(function(){ // this controls the port the application will be running on. // by adding 'process.enc.PORT' we enable the app to run on automated systems like heroku - app.set('port', process.env.PORT || 8001); + app.set('port', process.env.PORT || 8000); app.set('views', __dirname + '/views'); // sets views to the right directory app.set('view engine', 'ejs'); // initiates viewengine. We use EJS, or embedded js - http://embeddedjs.com/ diff --git a/views/header.ejs b/views/header.ejs index 74afad9..815be5c 100644 --- a/views/header.ejs +++ b/views/header.ejs @@ -11,10 +11,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <link rel="stylesheet" href="/css/bootstrap.css" /> <link rel="stylesheet" href="/css/bootstrap-responsive.css"> -<<<<<<< HEAD - <link rel="stylesheet" href="/css/styles.css" /> - <link rel="stylesheet" href="/css/use.css" /> -======= + <link rel="stylesheet" href="/css/shame.css" /> ->>>>>>> 44b7b0b25befea64ab85d7da8eb93aa905c76e08 |