fix: resolve merge conflict in tui.go

Ritik Pal · Ritik Pal · commit 7bbca1a66cdd · 2025-04-28T23:53:00.000+05:30
diff --git a/internal/tui/tui.go b/internal/tui/tui.go
@@ -25,6 +25,7 @@ type keyMap struct {
 	Help          key.Binding
 	SwitchSession key.Binding
 	Commands      key.Binding
+	Models        key.Binding
 }
 
 func NewKeyMap(hotkeys config.HotkeyConfig) keyMap {
@@ -54,6 +55,11 @@ func NewKeyMap(hotkeys config.HotkeyConfig) keyMap {
 			hotkeys.Commands,
 			"commands",
 		),
+		Models: config.GetKeyBinding(
+			hotkeys.Models,
+			hotkeys.Models,
+			"model selection",
+		),
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ type keyMap struct {`
`25`	`25`	`Help key.Binding`
`26`	`26`	`SwitchSession key.Binding`
`27`	`27`	`Commands key.Binding`
	`28`	`+ Models key.Binding`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`func NewKeyMap(hotkeys config.HotkeyConfig) keyMap {`
`@@ -54,6 +55,11 @@ func NewKeyMap(hotkeys config.HotkeyConfig) keyMap {`
`54`	`55`	`hotkeys.Commands,`
`55`	`56`	`"commands",`
`56`	`57`	`),`
	`58`	`+ Models: config.GetKeyBinding(`
	`59`	`+ hotkeys.Models,`
	`60`	`+ hotkeys.Models,`
	`61`	`+ "model selection",`
	`62`	`+ ),`
`57`	`63`	`}`
`58`	`64`	`}`
`59`	`65`