Housecleaning.

mongolab · Nov 20, 2012 · 17d9a1b · 17d9a1b
1 parent e28f8d8
commit 17d9a1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 168 deletions.
diff --git a/app.js b/app.js
@@ -158,7 +158,8 @@ var html1 = '<title> hello-mongoose: MongoLab MongoDB Mongoose Node.js Demo on H
 See the <a href="https://devcenter.heroku.com/articles/nodejs-mongoose">supporting article on the Dev Center</a> to learn more about data modeling with Mongoose. \
 <br\> \
 <br\> \
-<<<<<<< HEAD
+See the <a href="https://devcenter.heroku.com/articles/nodejs-mongoose">supporting article on the Dev Center</a> to learn more about data modeling with Mongoose. \
+<br\> \
 <br\> <h2> All Documents in MonogoDB database </h2> <pre><code> ';
 var html2 = '</code></pre> <br\> <i>';
 var html3 = ' documents. </i> <br\> <br\>';

diff --git a/diff.txt b/diff.txt