wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Resolve conflict

Browse source 
Conflict introduced in 9ee4a85a99
This commit is contained in:
Robert Hensing 2025-01-15 07:10:34 +01:00
parent 10438e6cfd
commit 1422832f7c
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/manual/src/language/operators.md
View file

@ -32,13 +32,8 @@
[string]: ./types.md#type-string [string]: ./types.md#type-string
[path]: ./types.md#type-path [path]: ./types.md#type-path
[number]: ./types.md#type-float [number]: ./types.md#type-float
<<<<<<< HEAD
[list]: ./types.md#list
[attribute set]: ./types.md#attribute-set
=======
[list]: ./types.md#type-list [list]: ./types.md#type-list
[attribute set]: ./types.md#type-attrs [attribute set]: ./types.md#type-attrs
>>>>>>> 071ddbed5 (doc/manual: Fix some broken fragments)
<!-- TODO(@rhendric, #10970): ^ rationalize number -> int/float --> <!-- TODO(@rhendric, #10970): ^ rationalize number -> int/float -->