merge requirements

2018-10-16 07:55:17 -07:00 · 2018-10-16 07:55:17 -07:00 · 07bd8bf870
--- a/cloudy_mozdef/requirements.txt
+++ b/cloudy_mozdef/requirements.txt
@ -2,8 +2,5 @@ ansible
 credstash
 faker
 awscli
-<<<<<<< HEAD
 awsudo
-=======
 yamllint
->>>>>>> 7a4a0ccf9620c58eb05b04f8971839970b1667ae