fix merge collision that got commited by mistake

a503d204 · Sef Kloninger · 57444654 · a503d204
Commit a503d204 authored Apr 17, 2013 by Sef Kloninger
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

ansible-requirements.txt
+0 -4

No files found.
--- a/ansible-requirements.txt
+++ b/ansible-requirements.txt
 Jinja2==2.6
 PyYAML==3.10
-<<<<<<< Updated upstream
-ansible
-=======
 ansible==1.1
->>>>>>> Stashed changes
 argparse==1.2.1
 boto==2.8.0
 paramiko==1.10.1