All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 30497cb5 authored by Kevin Atkinson's avatar Kevin Atkinson

Add .merge-build to .gitignore.

parent 5ac14e79
...@@ -2,3 +2,4 @@ event/trafgen/tg2.0 ...@@ -2,3 +2,4 @@ event/trafgen/tg2.0
sensors/nfstrace/nfsdump2/Makefile sensors/nfstrace/nfsdump2/Makefile
sensors/nfstrace/nfsdump2/config.h sensors/nfstrace/nfsdump2/config.h
sensors/nfstrace/nfsdump2/config.log sensors/nfstrace/nfsdump2/config.log
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment