From ef6a20ccbc988bffaeb307f3bb2296046369f7e4 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Wed, 10 Jan 2024 01:26:37 +0100
Subject: [PATCH] Fix merge conflict

---
 langs/layers/ca.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index f89d20f614..d2b03ad3c9 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -9186,4 +9186,4 @@
             "render": "Turbina eòlica"
         }
     }
-}
\ No newline at end of file
+}