fix merge artifacts

Signed-off-by: openhabian <openhabian@openHABian>

Author: openhabian

build-image/openhabian.conf

@@ -9,7 +9,7 @@
 # KEEP THE SPACE IT IS IMPORTANT !!
 
 # Hostname to set this one to
-hostname=openhabian
+hostname=smarthouse
 # if it exists, the default user (with its working environment) will be renamed to this username given here ...
 username=admin
 # ... and given this password. The password will be removed from this file after completion for security reasons.