diff options
| -rw-r--r-- | salt/openbook/ansible/files/openjdk.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
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 |