Merge branch 'clean-up-gitignore' into 'master'

Fix gitignore and delete gitignores in subdirs

See merge request veloren/veloren!91

Former-commit-id: 689231e73e7a97a49fb3d20d76ccc43af3f2681a
This commit is contained in:
Forest Anderson 2019-04-29 20:14:52 +00:00
commit 0ca4b55322
8 changed files with 3 additions and 29 deletions

8
.gitignore vendored
View File

@ -15,9 +15,7 @@
*.code-workspace
# Veloren
**/server_conf.toml
**/keybinds.toml
**/settings.toml
assets/voxygen
voxygen/keybinds.toml
settings.toml
*.rar
*.log

4
chat-cli/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target
/assets
**/*.rs.bk.rar
Cargo.lock

3
client/.gitignore vendored
View File

@ -1,3 +0,0 @@
/target
**/*.rs.bk
Cargo.lock

3
common/.gitignore vendored
View File

@ -1,3 +0,0 @@
/target
**/*.rs.bk
Cargo.lock

View File

@ -1,3 +0,0 @@
/target
**/*.rs.bk
Cargo.lock

3
server/.gitignore vendored
View File

@ -1,3 +0,0 @@
/target
**/*.rs.bk
Cargo.lock

5
voxygen/.gitignore vendored
View File

@ -1,5 +0,0 @@
/target
**/*.rs.bk
Cargo.lock
settings.toml
voxygen.log

3
world/.gitignore vendored
View File

@ -1,3 +0,0 @@
/target
**/*.rs.bk
Cargo.lock