Merge branch 'develop'

a1eb3c1 - Fix bug created in merge conflict.
IdlePhysicist · Feb 10, 2022 · fce3570 · fce3570
2 parents ab322a7 + a1eb3c1
commit fce3570
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/internal/gui/cavers.go b/internal/gui/cavers.go
@@ -13,7 +13,7 @@ import (
 
 type cavers struct {
 	*cview.Table
-	filterCol, filterTerm string
+	filterCol, filterTerm, filterAction string
 }
 
 func newCavers(g *Gui) *cavers {

diff --git a/internal/gui/caves.go b/internal/gui/caves.go
@@ -13,7 +13,7 @@ import (
 
 type caves struct {
 	*cview.Table
-	filterCol, filterTerm string
+	filterCol, filterTerm, filterAction string
 }
 
 func newCaves(g *Gui) *caves {

diff --git a/internal/gui/trips.go b/internal/gui/trips.go
@@ -12,7 +12,7 @@ import (
 
 type trips struct {
 	*cview.Table
-	filterCol, filterTerm string
+	filterCol, filterTerm, filterAction string
 }
 
 func newTrips(g *Gui) *trips {