0002314: /etc/issue on armhf is incorrect

ID	Project	Category	View Status	Date Submitted	Last Update

0002314	Kali Linux	Feature Requests	public	2015-06-05 15:22	2015-06-06 10:26

Reporter	steev	Assigned To	rhertzog
Priority	low	Severity	tweak	Reproducibility	always
Status	resolved	Resolution	fixed
Product Version	2.0

Summary	0002314: /etc/issue on armhf is incorrect
Description	When you boot a 2.0 image, /etc/issue appears to have not been modified correctly on arm. The contents show <<<<<<< HEAD Kali GNU/Linux 2.0~alpha1 kali tty1 Kali GNU/Linux 1.1.0 kali tty1 kali/stable

Date Modified	Username	Field	Change
2015-06-05 15:22	steev	New Issue
2015-06-06 10:26	rhertzog	Note Added: 0003379
2015-06-06 10:26	rhertzog	Status	new => resolved
2015-06-06 10:26	rhertzog	Resolution	open => fixed
2015-06-06 10:26	rhertzog	Assigned To	=> rhertzog

When you boot a 2.0 image, /etc/issue appears to have not been modified correctly on arm. The contents show
<<<<<<< HEAD
Kali GNU/Linux 2.0~alpha1 kali tty1

rhertzog 2015-06-06 10:25 administrator ~0003379	Oops, uploaded base-files_2.0~rc1+1.dsc to fix this.