Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-08-05 00:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

removing left-overs of merge diff from 0.4 to master

Browse Source
This commit is contained in:
Liran Tal
2015-07-03 07:51:08 +03:00
parent b76c2cd13b
commit 834bfd6cf8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/client/views/home.client.view.html
View File

@@ -54,11 +54,7 @@
<h2>
<strong>E</strong>xpress
</h2>
<<<<<<< HEAD:public/modules/core/views/home.client.view.html
<p><a target="_blank" href="http://expressjs.com/"> Express</a> is an app server. Check out <a target="_blank" href="http://expressjs.com/4x/api.html">The ExpressJS API reference for more information</a> or <a target="_blank" href="http://stackoverflow.com/questions/8144214/learning-express-for-node-js">StackOverflow</a> for more info.</p>
=======
<p><a target="_blank" href="http://expressjs.com/"> Express</a> is an app server. Check out <a target="_blank" href="http://expressjs.com/guide.html">The Express Guide</a> or <a target="_blank" href="http://stackoverflow.com/questions/8144214/learning-express-for-node-js">StackOverflow</a> for more info.</p>
>>>>>>> 0.4.0:modules/core/client/views/home.client.view.html
</div>
<div class="col-md-3">
<h2>