README.md: needs merge
airootfs/etc/X11/xinit/xinitrc: needs merge
airootfs/etc/group: needs merge
airootfs/etc/gshadow: needs merge
airootfs/etc/lightdm/lightdm.conf: needs merge
airootfs/etc/motd: needs merge
airootfs/etc/pacman.conf: needs merge
airootfs/etc/passwd: needs merge
airootfs/root/cinstall: needs merge
airootfs/root/cinstall2: needs merge
airootfs/root/liveuser/.xinitrc: needs merge
efiboot/loader/entries/linux-zen.conf: needs merge
packages.x86_64: needs merge
pacman.conf: needs merge
profiledef.sh: needs merge
README.md: needs merge
airootfs/etc/X11/xinit/xinitrc: needs merge
airootfs/etc/group: needs merge
airootfs/etc/gshadow: needs merge
airootfs/etc/lightdm/lightdm.conf: needs merge
airootfs/etc/motd: needs merge
airootfs/etc/pacman.conf: needs merge
airootfs/etc/passwd: needs merge
airootfs/root/cinstall: needs merge
airootfs/root/cinstall2: needs merge
airootfs/root/liveuser/.xinitrc: needs merge
efiboot/loader/entries/linux-zen.conf: needs merge
packages.x86_64: needs merge
pacman.conf: needs merge
profiledef.sh: needs merge