Fixed conflicts

This commit is contained in:
Rahul
2020-03-12 00:00:56 +05:30
parent 49bb77c098
commit 7d465ca489
2 changed files with 10 additions and 12 deletions

View File

@@ -276,6 +276,7 @@ export default {
notes: "Notes",
socketio: "Socket.IO",
event_name: "Event Name",
mqtt: "MQTT",
mqtt_topic: "Topic",
mqtt_topic_title: "Publish / Subscribe topic",
mqtt_publish: "Publish",