diff options
| author | TymanWasTaken <32660892+tymanwastaken@users.noreply.github.com> | 2021-05-28 21:54:50 -0600 |
|---|---|---|
| committer | TymanWasTaken <32660892+tymanwastaken@users.noreply.github.com> | 2021-05-28 21:54:50 -0600 |
| commit | 2456dab3db0d8eaae515606b83a6c0c317d009b0 (patch) | |
| tree | c20448112d43c1b4ffae1395584d9b202aeee3ed /.gitignore | |
| parent | 1e9e334097702c68d871365fc016aa096d03c491 (diff) | |
| parent | 5b5f0bf5667b922037508dfa88e40a1f8a2671ec (diff) | |
| download | tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.tar.gz tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.tar.bz2 tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.zip | |
fix conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -256,5 +256,6 @@ src/config/options.ts # Unused sqlite database, uses postgresql now but I am keeping it in here just in case data.db - +# IRONM00N's Crap src/config/options_old.ts +src/config/options_pi.ts |