Skip to content

Commit

Permalink
Merge pull request #19 from splunk-soar-connectors/jacobd-merge-confl…
Browse files Browse the repository at this point in the history
…icts

Fixing merge conflicts between next and main
  • Loading branch information
phantom-jacob authored Dec 11, 2024
2 parents 84d20fe + 4e5d7f6 commit 6ad0a34
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion misp.json
Original file line number Diff line number Diff line change
Expand Up @@ -2416,4 +2416,4 @@
}
]
}
}
}

0 comments on commit 6ad0a34

Please sign in to comment.