Resolves merge conflicts

1 files changed, 6 insertions, 0 deletions

diff --git a/devices/devices.go b/devices/devices.go
index 7360578..8873ae5 100644
--- a/devices/devices.go
+++ b/devices/devices.go
@@ -2,6 +2,7 @@ package devices
 
 import (
 	"log"
+	"github.com/jdkeke142/lingo-toml"
 )
 
 const (
@@ -15,6 +16,7 @@ var _shutdownFuncs []func() error
 var _devs map[string][]string
 var _defaults map[string][]string
 var _startup []func(map[string]string) error
+var tr lingo.Translations
 
 // RegisterShutdown stores a function to be called by gotop on exit, allowing
 // extensions to properly release resources.  Extensions should register a
@@ -86,3 +88,7 @@ func Devices(domain string, all bool) []string {
 	}
 	return _defaults[domain]
 }
+
+func SetTr(tra lingo.Translations) {
+	tr = tra
+}