From 75111623be87942d3c0a19eba34f96ba3d286878 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Thu, 3 Apr 2025 23:50:41 -0700
Subject: [PATCH] chore: remove conflict marker

---
 reference/users/youwen/config/harper-ls/dictionary.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/users/youwen/config/harper-ls/dictionary.txt b/reference/users/youwen/config/harper-ls/dictionary.txt
index 24bda15..de63ae0 100644
--- a/reference/users/youwen/config/harper-ls/dictionary.txt
+++ b/reference/users/youwen/config/harper-ls/dictionary.txt
@@ -18,9 +18,9 @@ transpiles
 Gradescope
 bijections
 disjunction
-<<<<<<< HEAD
 denumerable
 Multinomial
 biconditional
 hyperextensible
 diagonalization
+parametrization