diff options
| author | June McEnroe <june@causal.agency> | 2017-08-31 01:00:02 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2017-08-31 01:00:02 -0400 |
| commit | 2188bd834c546b40d4b19258f8729ecae86be853 (patch) | |
| tree | 958382939b09e1f7a76064ea3d02dc1379aac281 /.gitignore | |
| parent | Use only foreground color for selecting spawn (diff) | |
| download | torus-2188bd834c546b40d4b19258f8729ecae86be853.tar.gz torus-2188bd834c546b40d4b19258f8729ecae86be853.zip | |
Add quick data file merge tool
Hopefully I won't have to use it ever again.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d08a301..c072f2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ chroot.tar client help +merge meta root server |