summaryrefslogtreecommitdiffstats
path: root/config.go
diff options
context:
space:
mode:
authorSean E. Russell <ser@ser1.net>2020-02-14 07:52:33 -0600
committerSean E. Russell <ser@ser1.net>2020-02-14 07:52:33 -0600
commit64d4a81212a43a4b805b92963fd4da230b3ca313 (patch)
tree0d4b60ca935fce9fafb92a311fe4178529365f36 /config.go
parent7594f3ecec8d830fe4241c9a01f9939c932bb132 (diff)
parentfcdb71bfad2c782a480e980821f085e090cb437c (diff)
Merge remote-tracking branch 'mattLLVW/feature/network_interface_list'
Diffstat (limited to 'config.go')
-rw-r--r--config.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/config.go b/config.go
index 55ea91b..7eff495 100644
--- a/config.go
+++ b/config.go
@@ -14,7 +14,6 @@ import (
// TODO: Merge #167 configuration file (jrswab:configFile111)
// TODO: Merge #157 FreeBSD fixes & Nvidia GPU support (kraust:master)
// TODO: Merge #156 Added temperatures for NVidia GPUs (azak-azkaran:master)
-// TODO: Merge #152 (implements #148 & #149) (mattLLVW:feature/network_interface_list)
// TODO: Merge #147 filtering subprocesses by substring (rephorm:filter)
// TODO: Merge #140 color-related fix (Tazer:master)
// TODO: Merge #135 linux console font (cmatsuoka:console-font)