Skip to content
This repository has been archived by the owner on Nov 18, 2024. It is now read-only.

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Waters committed May 5, 2019
1 parent d7b6bd1 commit 9faf6b7
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<<<<<< HEAD
# Cloudtrailbeat
An Elastic beat for cloudtrail w/ S3 -> SNS -> SQS

Welcome to Cloudtrailbeat.

Expand Down Expand Up @@ -116,6 +116,3 @@ make release

This will fetch and create all images required for the build process. The whole process to finish can take several minutes.
=======
# cloudtrailbeat
An Elastic beat for cloudtrail w/ S3 -> SNS -> SQS
>>>>>>> 11dd3844af290305ab269a31907eb91497b8b2e4

0 comments on commit 9faf6b7

Please sign in to comment.