diff options
| author | June McEnroe <programble@gmail.com> | 2017-08-31 01:00:02 -0400 |
|---|---|---|
| committer | June McEnroe <programble@gmail.com> | 2017-08-31 01:00:02 -0400 |
| commit | ccf62ec6e3bbf785928962223221eefc8cfef653 (patch) | |
| tree | 2eb8146e2f9391c4011a93f73968294447a8a5cd /.gitignore | |
| parent | Use only foreground color for selecting spawn (diff) | |
| download | torus-ccf62ec6e3bbf785928962223221eefc8cfef653.tar.gz torus-ccf62ec6e3bbf785928962223221eefc8cfef653.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 |