diff options
author | ivan <ivan> | 2011-06-15 01:41:06 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-06-15 01:41:06 +0000 |
commit | e40181be768dc726e52698c016e540a0b443b0f9 (patch) | |
tree | 19e89a553128f41bef86be7d445c8074c8056de7 /Makefile | |
parent | 30e0af53bde61f5272c942814140b78ce44815a5 (diff) |
added protection to Makfile against deploying cvs conflicts
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -409,7 +409,7 @@ clean: make clean check-conflicts: - ! grep -r --exclude=config.log --exclude=config.status --exclude=gnupg_details_on_output_formats '^=======$$' . + ! grep -r --exclude=config.log --exclude=config.status --exclude=gnupg_details_on_output_formats --exclude=mason_handler '^=======$$' . #these are probably only useful if you're me... |