Fixed conflict on .gitignore
Fixed conflict on .gitignore

radut/moquette,muka/moquette,thinkjoyorg/moquette,lants1/moquette,biddyweb/moquette,surferboy87/MQTT-TSS-Moquette-Server,WilliamKinaan/moquette,windbender/moquette,Qbitus/moquette,StannisLin/moquette,faust93/moquette,surferboy87/MQTT-TSS-Moquette-Server,swarwick/moquette,Qbitus/moquette,faust93/moquette,interaktionsbyran/moquette,biddyweb/moquette,soenter/moquette,NvIM/moquette,andsel/moquette,muka/moquette,WilliamKinaan/moquette,lants1/moquette,thinkjoyorg/moquette,dwimberger/moquette,StannisLin/moquette,StannisLin/moquette,sureddy/moquette,Qbitus/moquette,dant3/moquette,andsel/moquette,windbender/moquette,dwimberger/moquette,radut/moquette,biddyweb/moquette,sureddy/moquette,WilliamKinaan/moquette,mackristof/moquette,swarwick/moquette,sureddy/moquette,biddyweb/moquette,mackristof/moquette,mackristof/moquette,soenter/moquette,windbender/moquette,andsel/moquette,swarwick/moquette,radut/moquette,dant3/moquette,faust93/moquette,Qbitus/moquette,sureddy/moquette,bazi/moquette,soenter/moquette,lants1/moquette,dwimberger/moquette,soenter/moquette,thinkjoyorg/moquette,faust93/moquette,bazi/moquette,NvIM/moquette,thinkjoyorg/moquette,swarwick/moquette,muka/moquette,dwimberger/moquette,NvIM/moquette,windbender/moquette,bazi/moquette,andsel/moquette,dant3/moquette,StannisLin/moquette,lants1/moquette,bazi/moquette,interaktionsbyran/moquette,muka/moquette,NvIM/moquette,dant3/moquette,mackristof/moquette,interaktionsbyran/moquette,surferboy87/MQTT-TSS-Moquette-Server,radut/moquette,WilliamKinaan/moquette,surferboy87/MQTT-TSS-Moquette-Server