Skip to content
This repository was archived by the owner on Dec 26, 2020. It is now read-only.

Commit 92a23e1

Browse files
Sebastian GumprichSebastian Gumprich
Sebastian Gumprich
authored and
Sebastian Gumprich
committed
remove merge conflict line
1 parent 8a4046b commit 92a23e1

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

‎tasks/main.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
changed_when: false
6464
check_mode: no
6565

66-
<<<<<<< HEAD
6766
# Install the 2FA packages and setup the config in PAM and SSH
6867

6968
- block:

0 commit comments

Comments
 (0)