diff --git a/tools/merge/.gitignore b/tools/merge/.gitignore index e2a893582820e7fd93bed9caea76089436af5dc0..960e49ffce06a6a6e92f8b2995ef39544cc1e743 100644 --- a/tools/merge/.gitignore +++ b/tools/merge/.gitignore @@ -1,3 +1,4 @@ +/main /a.out /merge /rocksmerge diff --git a/tools/merge/main b/tools/merge/main deleted file mode 100755 index c8e43b052bd40b98394aeba94d8f2ad85c0f308b..0000000000000000000000000000000000000000 Binary files a/tools/merge/main and /dev/null differ