Permalink
Browse files

merge conflicts fixed

  • Loading branch information...
2 parents 7044ec2 + 7d1cc86 commit e6a4a7e0ff761cfef0e68c70a5f42b7c78bc6f99 @SlashmanX committed Oct 8, 2013
Showing with 5 additions and 1 deletion.
  1. +1 −1 .gitignore
  2. +4 −0 README.md
View
@@ -12,4 +12,4 @@ logs
results
npm-debug.log
-node_modules
+node_modules
View
@@ -0,0 +1,4 @@
+reddit-live
+===========
+
+Real time reddit comment streaming

0 comments on commit e6a4a7e

Please sign in to comment.