Skip to content

Commit

Permalink
remove merge conflict line
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Gumprich authored and Sebastian Gumprich committed Dec 23, 2017
1 parent 38d34a1 commit 2c89462
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion tasks/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
changed_when: false
check_mode: no

<<<<<<< HEAD
# Install the 2FA packages and setup the config in PAM and SSH

- block:
Expand Down

0 comments on commit 2c89462

Please sign in to comment.