Fix the merge conflicts
This commit is contained in:
commit
8aa94372c3
8 changed files with 66 additions and 6 deletions
|
@ -1,4 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
# setting the locale, some users have issues with different locales, this forces the correct one
|
||||
export LC_ALL=en_US.UTF-8
|
||||
|
||||
get_tmux_option() {
|
||||
local option=$1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue