summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKagami Sascha Rosylight <saschanaz@outlook.com>2023-03-25 08:20:34 +0100
committerKagami Sascha Rosylight <saschanaz@outlook.com>2023-03-25 08:20:34 +0100
commitabdb43c440e2a1349585c7fbbcd4c5ef38b11604 (patch)
tree9c4d37a3eeb902b65f0d8e487106282a11578ec7 /.gitignore
parentAdditional changes for the merge (diff)
downloadsharkey-abdb43c440e2a1349585c7fbbcd4c5ef38b11604.tar.gz
sharkey-abdb43c440e2a1349585c7fbbcd4c5ef38b11604.tar.bz2
sharkey-abdb43c440e2a1349585c7fbbcd4c5ef38b11604.zip
Revert "Additional changes for the merge"
This reverts commit efb5e1d1cc95b373b00cf2fedfc5b3bd745a1753.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 29420311b8..c413cd4da9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@ api-docs.json
.DS_Store
/files
ormconfig.json
-temp
# blender backups
*.blend1