resolve merge conflict

This commit is contained in:
Wolfgang Hottgenroth 2019-08-09 18:38:41 +02:00
commit bec54aa3ed
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F

View File

@ -1,4 +1,4 @@
#!/bin/bash
/usr/local/bin/homekit2mqtt -x -v debug -m $DATA_DIR/mapping.json -s $STORAGE_DIR -b $NAME -p $PORT -w $WEBPORT -u $BROKER --insecure -c $PIN
/usr/local/bin/homekit2mqtt -v debug -m $DATA_DIR/mapping.json -s $STORAGE_DIR -b $NAME -p $PORT -w $WEBPORT -u $BROKER --insecure -c $PIN