Browse code

Merging conflict. 788c9af05684f4b9e39e7f15de2c06c4c8291cbd

Robby Russell authored on 26/10/2009 at 16:09:00
Showing 1 changed files
... ...
@@ -55,6 +55,3 @@ alias et='mate . &'
55 55
 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
56 56
 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
57 57
 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
58
-
59
-
60
-