Skip to content
Snippets Groups Projects
Commit 2bf902fd authored by Shaman Narayanasamy's avatar Shaman Narayanasamy
Browse files

Conflict fixed

parent 0dfc565d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.gitignore
+ 1
− 0
View file @ 2bf902fd
......@@ -8,3 +8,4 @@ docker/Dockerfile~
rules/Analysis/MGMT.rules~
rules/Analysis/master.rules~
db
conf/userconfig.imp.json
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