fix merge artifacts

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

Author: openhabian

includes/generic/lc

@@ -8,9 +8,5 @@ source $CONFIGFILE
 source ${BASEDIR}/functions/helpers.bash
 source ${BASEDIR}/functions/storm.house.bash
 
-<<<<<<< HEAD:includes/generic/lc
 retrieve_license "$@"
-=======
-setup_pv_config "$@"
->>>>>>> 2da72a7f3 (setup_pv statt nur inverter jetzt auch samt smart meter):includes/setup_pv