remove merge conflict line

Sebastian Gumprich · Sebastian Gumprich · commit 92a23e19ee53 · 2017-12-23T15:08:52.000+01:00
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -63,7 +63,6 @@
   changed_when: false
   check_mode: no
 
-<<<<<<< HEAD
 # Install the 2FA packages and setup the config in PAM and SSH
 
 - block:
