From c666f304bc4d96e7c2c18235fcc51eaf8b0a6a2c Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Wed, 6 Sep 2017 11:05:20 -0600 Subject: removing a spurious commit block --- salt/openbook/ansible/files/openjdk.yaml | 3 --- 1 file changed, 3 deletions(-) (limited to 'salt/openbook') diff --git a/salt/openbook/ansible/files/openjdk.yaml b/salt/openbook/ansible/files/openjdk.yaml index a016866..69ccd72 100644 --- a/salt/openbook/ansible/files/openjdk.yaml +++ b/salt/openbook/ansible/files/openjdk.yaml @@ -35,10 +35,7 @@ with_items: - dev-java/icedtea:8 when: ansible_distribution == "Gentoo" -<<<<<<< HEAD -======= - name: "Set icedtea-8 as default java" shell: java-config -S icedtea-8 when: ansible_distribution == "Gentoo" ->>>>>>> 5d6764d17db282814ad18a15f08a74115dfa36f6 -- cgit v1.3