diff options
| author | Mica White <botahamec@outlook.com> | 2026-06-19 08:33:26 -0400 |
|---|---|---|
| committer | Mica White <botahamec@outlook.com> | 2026-06-19 08:33:26 -0400 |
| commit | f373301ce4a59c45551d487263e93cbb0d8a7bcc (patch) | |
| tree | f0f2a423b678b8c019f81e22470256ecea516d7c | |
| parent | 2732785289293fd7b5330fbda60e144a5e6a8424 (diff) | |
Fix conflict
| -rw-r--r-- | .config/fish/fish_variables | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 6f0402b..cf619b0 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -14,8 +14,4 @@ SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_f SETUVAR _fisher_plugins:patrickf1/fzf\x2efish SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR fish_greeting:\x1d -<<<<<<< HEAD SETUVAR fish_user_paths:/home/botahamec/\x2elocal/bin\x1e/usr/lib/ccache/bin\x1e/home/botahamec/go/bin\x1e/opt/rocm/bin -======= -SETUVAR fish_user_paths:/home/botahamec/\x2elocal/bin\x1e/usr/lib/ccache/bin\x1e/home/botahamec/go/bin ->>>>>>> 7401b97b6 (foo) |