xmlnya ke ganti trus

Xml dari net ieas
Merge remote-tracking branch 'origin/master'

xmlnya conflicts
Conflicts:
	ChipEMA/nbproject/private/private.xml