From ece3ab207b3a489a9164cca52e841cfdca3e9d68 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Mon, 20 Jan 2020 07:02:11 -0500 Subject: [PATCH] Fixed automerge --- roles/shell/tasks/users.yml | 38 ------------------------------------- 1 file changed, 38 deletions(-) diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index 75cbddca..ee68dd6a 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -174,42 +174,4 @@ - include: users/yximdoa.yml #- include: users/z00t.yml - include: users/zszoke.yml -<<<<<<< HEAD -- include: users/neo.yml -#- include: users/init0.yml -- include: users/lugubris.yml -#- include: users/syncore.yml -- include: users/geetfun.yml -#- include: users/jin264.yml -#- include: users/camellia.yml -- include: users/liesinties.yml -#- include: users/hijaben.yml -#- include: users/delta.yml -- include: users/neil.yml -- include: users/hitomi.yml -- include: users/sakhawkins.yml -- include: users/atdx.yml -- include: users/dingb4t.yml -- include: users/kronos.yml -#- include: users/leonid.yml -- include: users/shark.yml -- include: users/stereo.yml -- include: users/joro.yml -- include: users/info.yml -- include: users/infoTV.yml -- include: users/clu.yml -- include: users/sebre.yml -- include: users/olya.yml -#- include: users/kpeh.yml -- include: users/saturnv.yml -- include: users/chispitos.yml -- include: users/bacterio.yml -- include: users/jac98.yml -- include: users/turboblack.yml -- include: users/d34d.yml -- include: users/noce.yml -- include: users/cyber.yml -- include: users/hamlet.yml -======= ->>>>>>> fdde9674f127110abfa25bcf15d8c92a1961e4be - include: users/alotl.yml