fix merge conflict

basic-system/defaults/main.yml

@@ -6,3 +6,4 @@ hosts_additionals: []
 etckeeper: true
 rsyslog_needed: false
 hosts_precious: false
+journal_persitent_with_package: true

basic-system/tasks/logging.yml

@@ -19,6 +19,7 @@
     - syslogserver is not defined or syslogserver.split(":")[0] != ansible_fqdn
     - ansible_distribution_major_version|int >= 9
     - not rsyslog_needed
+    - journal_persitent_with_package
   register: syslog_provider
   tags:
     - syslog
@@ -29,7 +30,9 @@
     path: /var/log/journal
     state: directory
   when:
-    - ansible_distribution_major_version|int < 9
+     (ansible_distribution_major_version|int < 9) or
+     (not journal_persitent_with_package)
+  register: syslog_provider
   notify:
     - configure journal directory
   tags: