vbatts/nodejs-ex
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
ffactory-ofcl 2017-11-25 23:23:45 +01:00
commit 0032182c06
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
views/index.html
View file

@ -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>