summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorBenjamin Culkin <scorpress@gmail.com>2024-06-05 16:54:53 -0400
committerBenjamin Culkin <scorpress@gmail.com>2024-06-05 16:54:53 -0400
commitf4a6a1513f3610f76e9f084e9e17f1da183d184d (patch)
tree3344d8c047093d42726aa76779c7978f992c474b /.gitignore
parent6db15ffab1f9ae694407234a4c7009b72c8a4287 (diff)
parentb9c6794c23f6878b24ab61dbf3fd6a1ff2a9af23 (diff)
Merge branch 'trunk' of git@ashardalon.com:inflexion.git into trunkHEADtrunk
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 84273ad..0f82477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ HTML/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/target/
+.settings