Merge branch 'develop'

IdlePhysicist · IdlePhysicist · commit fce357063d5d · 2022-02-09T22:26:41.000-07:00
a1eb3c1 - Fix bug created in merge conflict.
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 {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`type cavers struct {`
`15`	`15`	`*cview.Table`
`16`		`- filterCol, filterTerm string`
	`16`	`+ filterCol, filterTerm, filterAction string`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func newCavers(g Gui) cavers {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`type trips struct {`
`14`	`14`	`*cview.Table`
`15`		`- filterCol, filterTerm string`
	`15`	`+ filterCol, filterTerm, filterAction string`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`func newTrips(g Gui) trips {`