merge

arashkay · Oct 17, 2015 · 6e824c5 · 6e824c5
2 parents a9e5310 + ad043aa
commit 6e824c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,13 +17,13 @@ coverage
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
+# node-waf configuration
+.lock-wscript
+
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
 # Dependency directory
 # Commenting this out is preferred by some people, see
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
 node_modules
-
-# Users Environment Variables
-.lock-wscript
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+# good-hapi-rollbar
+Good Rollbar reporter for Hapi.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# good-hapi-rollbar
		Good Rollbar reporter for Hapi.js