Merge branch 'master' of https://github.com/ffactory-ofcl/nodejs-ex

2017-11-25 23:23:45 +01:00 · 2017-11-25 23:23:45 +01:00 · 0032182c06
parent 6d1c38ad59 708d2532b2
commit 0032182c06
1 changed files with 4 additions and 0 deletions
--- a/views/index.html
+++ b/views/index.html
@ -216,8 +216,12 @@ pre {

 <section class='container'>
          <hgroup>
+<<<<<<< HEAD
            <h1>Welcome to your Node.js application on OpenShift. Dis gon be gud, very nice as well.</h1>
            <h4>Strap yourself in for this wild ride.</h4>
+=======
+            <h1>Welcome to your Node.js application on OpenShift. Dis gon be gud</h1>
+>>>>>>> 708d2532b2ba8d59003151829cafe15cfd5587e6
          </hgroup>