Permalink
Browse files

Merge remote-tracking branch 'origin/rename-script-test' into core

Conflicts:
	README.md
  • Loading branch information...
jbarnette committed Sep 11, 2012
2 parents e29a3a0 + 7652d82 commit bf16b2c4dbc7e2765ca41d3f1c91e8d73ab31ff4
Showing with 1 addition and 1 deletion.
  1. +1 −1 README.md
  2. 0 script/{test → tests}
View
@@ -2,4 +2,4 @@
extracting a slim vines-core with a bunch of gems layered on top of
it. This is totally broken and shouldn't be used by anybody. There are
no working development instructions right now. I suggest starting with
-`script/bootstrap && script/test` if you really must poke around.
+`script/bootstrap && script/tests` if you really must poke around.
File renamed without changes.

0 comments on commit bf16b2c

Please sign in to comment.