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

Merge 0032182c06 into d1af14dc9f

This commit is contained in:
ffactory-ofcl 2017-11-25 22:23:54 +00:00 committed by GitHub
parent d1af14dc9f 0032182c06
commit 38a8e4f2f6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
views/index.html
View File

@ -216,7 +216,12 @@ pre {
<section class='container'>
<hgroup>
<h1>Welcome to your Node.js application on OpenShift</h1>
<<<<<<< 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>