1.4.0 merge conflicts - Githubissues

cisagov / LME

Logging Made Easy (LME) is a no cost, open source platform that centralizes log collection, enhances threat detection, and enables real-time alerting, helping small to medium-sized organizations secure their infrastructure.

https://www.cisa.gov/resources-tools/services/logging-made-easy

Other

892 stars 72 forks source link

1.4.0 merge conflicts #418

Closed cbaxley closed 3 months ago

cbaxley commented 3 months ago

🗣 Description

💭 Motivation and context

📷 Screenshots (DELETE IF UNAPPLICABLE)

🧪 Testing

✅ Pre-approval checklist

[ ] Changes are limited to a single goal AND the title reflects this in a clear human readable format
[ ] Issue that this PR solves has been selected in the Development section
[ ] I have read and agree to LME's CONTRIBUTING.md document.
[ ] The PR adheres to LME's requirements in RELEASES.md
[ ] These code changes follow cisagov code standards.
[ ] All relevant repo and/or project documentation has been updated to reflect the changes in this PR.

✅ Pre-merge Checklist

[ ] All tests pass
[ ] PR has been tested and the documentation for testing is above
[ ] Squash and merge all commits into one PR level commit

✅ Post-merge Checklist

[ ] Delete the branch to keep down number of branches