From f35e8d7b98da61f456166d528078e45ba69db8df Mon Sep 17 00:00:00 2001 From: timokoesters Date: Mon, 29 Apr 2019 19:49:24 +0200 Subject: [PATCH] Fix gitignore and delete gitignores in subdirs Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759 --- .gitignore | 8 +++----- chat-cli/.gitignore | 4 ---- client/.gitignore | 3 --- common/.gitignore | 3 --- server-cli/.gitignore | 3 --- server/.gitignore | 3 --- voxygen/.gitignore | 5 ----- world/.gitignore | 3 --- 8 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 chat-cli/.gitignore delete mode 100644 client/.gitignore delete mode 100644 common/.gitignore delete mode 100644 server-cli/.gitignore delete mode 100644 server/.gitignore delete mode 100644 voxygen/.gitignore delete mode 100644 world/.gitignore diff --git a/.gitignore b/.gitignore index 96ef2e499f..26094c130e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,7 @@ *.code-workspace # Veloren -**/server_conf.toml -**/keybinds.toml -**/settings.toml -assets/voxygen +voxygen/keybinds.toml +settings.toml *.rar - +*.log diff --git a/chat-cli/.gitignore b/chat-cli/.gitignore deleted file mode 100644 index 6197682122..0000000000 --- a/chat-cli/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -/assets -**/*.rs.bk.rar -Cargo.lock diff --git a/client/.gitignore b/client/.gitignore deleted file mode 100644 index 693699042b..0000000000 --- a/client/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -**/*.rs.bk -Cargo.lock diff --git a/common/.gitignore b/common/.gitignore deleted file mode 100644 index 693699042b..0000000000 --- a/common/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -**/*.rs.bk -Cargo.lock diff --git a/server-cli/.gitignore b/server-cli/.gitignore deleted file mode 100644 index 693699042b..0000000000 --- a/server-cli/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -**/*.rs.bk -Cargo.lock diff --git a/server/.gitignore b/server/.gitignore deleted file mode 100644 index 693699042b..0000000000 --- a/server/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -**/*.rs.bk -Cargo.lock diff --git a/voxygen/.gitignore b/voxygen/.gitignore deleted file mode 100644 index 6f47212ae1..0000000000 --- a/voxygen/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/target -**/*.rs.bk -Cargo.lock -settings.toml -voxygen.log diff --git a/world/.gitignore b/world/.gitignore deleted file mode 100644 index 693699042b..0000000000 --- a/world/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -**/*.rs.bk -Cargo.lock