fixed merge formatting
fixed merge formatting

kairosdb/kairosdb,lgscofield/kairosdb,deejay1/kairosdb,at15/kairosdb-1,ppbizapps/kairosdb,at15/kairosdb-1,at15/kairosdb-1,ppbizapps/kairosdb,ppbizapps/kairosdb,pawellesniewski/kairosdb,wangtuanjie/kairosdb,deejay1/kairosdb,george-aprozeanu/kairosdb,ppbizapps/kairosdb,rdettai/kairosdb,kairosdb/kairosdb,rdettai/kairosdb,kairosdb/kairosdb,kairosdb/kairosdb,lgscofield/kairosdb,lgscofield/kairosdb,george-aprozeanu/kairosdb,kairosdb/kairosdb,wangtuanjie/kairosdb,wangtuanjie/kairosdb,wangtuanjie/kairosdb,at15/kairosdb-1,deejay1/kairosdb,rdettai/kairosdb,panqingcui/kairosdb-1,lgscofield/kairosdb,pawellesniewski/kairosdb,pawellesniewski/kairosdb,panqingcui/kairosdb-1,rdettai/kairosdb,george-aprozeanu/kairosdb,pawellesniewski/kairosdb,panqingcui/kairosdb-1,panqingcui/kairosdb-1,kairosdb/kairosdb,george-aprozeanu/kairosdb,panqingcui/kairosdb-1,deejay1/kairosdb,lgscofield/kairosdb,pawellesniewski/kairosdb,at15/kairosdb-1,ppbizapps/kairosdb,rdettai/kairosdb,wangtuanjie/kairosdb,deejay1/kairosdb,george-aprozeanu/kairosdb