From 0e80099258df03867d28b1ef103f3412cdbca48b Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Mon, 21 Feb 2011 18:09:21 -0800
Subject: [PATCH] Add logs and server.pid

Conflicts:

	PlayFramework.gitignore
---
 PlayFramework.gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
index f9762902..26ada5b3 100644
--- a/PlayFramework.gitignore
+++ b/PlayFramework.gitignore
@@ -9,6 +9,7 @@ db
 eclipse
 log
 logs
-server.pid
+tmp
 test-result
-tmp
\ No newline at end of file
+eclipse
+server.pid