Merge conflict

halfdan · Jul 8, 2010 · 698b7e4 · 698b7e4
2 parents 679cf18 + b560177
commit 698b7e4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/config-sample.ini b/config-sample.ini
@@ -19,4 +19,4 @@ host=localhost
 user=rvlogger
 password=rvlogger
 name=rvlogger
-dump=30
+dump=30
diff --git a/lib/rvlogger.rb b/lib/rvlogger.rb