Add logs and server.pid

Conflicts:

	PlayFramework.gitignore

diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
index f976290282d34979ad1346aed8c39f320cdf5a15..26ada5b39d288073f15d67fba8560c01c2f2563d 100644 (file)
--- 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