From 1422832f7c5e9e642080474e4ea171225a1b68fb Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 15 Jan 2025 07:10:34 +0100
Subject: [PATCH] Resolve conflict

Conflict introduced in 9ee4a85a9951ca3905e3fcf43695ecf0cf721712
---
 doc/manual/src/language/operators.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/manual/src/language/operators.md b/doc/manual/src/language/operators.md
index a041f124b..041bdc6e7 100644
--- a/doc/manual/src/language/operators.md
+++ b/doc/manual/src/language/operators.md
@@ -32,13 +32,8 @@
 [string]: ./types.md#type-string
 [path]: ./types.md#type-path
 [number]: ./types.md#type-float
-<<<<<<< HEAD
-[list]: ./types.md#list
-[attribute set]: ./types.md#attribute-set
-=======
 [list]: ./types.md#type-list
 [attribute set]: ./types.md#type-attrs
->>>>>>> 071ddbed5 (doc/manual: Fix some broken fragments)
 
 <!-- TODO(@rhendric, #10970): ^ rationalize number -> int/float -->