Skip to content

Commit 16f1519

Browse files
committed
docs: fix merge conflict
1 parent 4461176 commit 16f1519

File tree

2 files changed

+2
-174
lines changed

2 files changed

+2
-174
lines changed

README.md~HEAD

Lines changed: 0 additions & 172 deletions
This file was deleted.

docs/manual/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[programs/nushell]: modules/collection/programs/nushell.nix
88
[programs/zsh]: modules/collection/programs/zsh.nix
99
[programs/nushell]: modules/collection/programs/nushell.nix
10-
[programs/hyprland]: modules/collection/programs/hyprland.nix
10+
[desktops/hyprland]: modules/collection/desktops/hyprland.nix
1111
[#17]: https://github.com/snugnug/hjem-rum/issues/17
1212
[@eclairevoyant]: https://github.com/eclairevoyant
1313
[@NotAShelf]: https://github.com/NotAShelf
@@ -140,7 +140,7 @@ modules that load environmental variables include:
140140
- [programs/fish]
141141
- [programs/nushell]
142142
- [programs/zsh]
143-
- [programs/hyprland]
143+
- [desktops/hyprland]
144144

145145
If you are either using something like our GTK module, or are manually adding
146146
variables to `environment.sessionVariables`, but are neither loading those

0 commit comments

Comments
 (0)