diff options
| author | Dennis Kobert <d-kobert@web.de> | 2019-06-12 21:51:39 +0200 |
|---|---|---|
| committer | Dennis Kobert <d-kobert@web.de> | 2019-06-12 21:51:39 +0200 |
| commit | 9e9c1c822a64c0a65033b7eed07ea661a385cecc (patch) | |
| tree | ee699d4e93bb4204f5f4e04cd14f6d77365b81b4 /.gitignore | |
| parent | 304437b834e8c87687f68333ae67a13ee1377a73 (diff) | |
| parent | 3a3d0fc3d4733f8908e23a03f860d76340479ec4 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -244,6 +244,11 @@ FakesAssemblies/ **/*.Server/ModelManifest.xml _Pvt_Extensions +# auxiliary files +/DSACore/PropertiesDSALib-Auxiliary-CommandInfo.json +/DSACore/PropertiesDSALib-DSA_Game-Characters-Character.json +/DSACore/PropertiesNewtonsoft-Json-Linq-JProperty.json + # Paket dependency manager .paket/paket.exe paket-files/ @@ -268,7 +273,4 @@ __pycache__/ Cargo.lock # dont save that target (bad boy) -/game_server/target -/DSACore/PropertiesDSALib-Auxiliary-CommandInfo.json -/DSACore/PropertiesDSALib-DSA_Game-Characters-Character.json -/DSACore/PropertiesNewtonsoft-Json-Linq-JProperty.json +**/*/target |