From 42cf035f9023e773a20d2b14a984ba0a5fef9c60 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 4 Mar 2014 10:15:26 -0500 Subject: don't run generate in start.sh, ignore nohup.out --- .gitignore | 3 ++- start.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9e29fc1..0e07518 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,8 @@ # The above is from Rails. The following is from Luke. /vendor/bundle -# As noted aboce, you probably want to add the following to your global git config. +nohup.out +# As noted above, you probably want to add the following to your global git config. .~lock.* *~ *# diff --git a/start.sh b/start.sh index 6c0d594..cb9cdda 100755 --- a/start.sh +++ b/start.sh @@ -1,5 +1,4 @@ #!/bin/bash -generate.sh nohup bundle exec rails server & -- cgit v1.2.3-2-g168b