add compat

This commit is contained in:
vincent 2019-11-24 15:11:29 +01:00
parent 4bc20a3fd7
commit fb8586485f

View File

@ -42,7 +42,6 @@ system_base_softwares_arch:
- 'unrar' - 'unrar'
- 'git-lfs' - 'git-lfs'
<<<<<<< HEAD
system_base_softwares_debian: system_base_softwares_debian:
- 'zsh' - 'zsh'
- 'stow' - 'stow'
@ -73,8 +72,4 @@ system_base_softwares_debian:
- 'unrar' - 'unrar'
- 'git-lfs' - 'git-lfs'
=======
system_upgrade: false system_upgrade: false
>>>>>>> master