From 8a587542c8392d3e6b1db68aa4a979c147ad4b37 Mon Sep 17 00:00:00 2001
From: LeonardoBizzoni <71130040+LeonardoBizzoni@users.noreply.github.com>
Date: Sun, 24 Dec 2023 19:06:05 +0100
Subject: [PATCH] missato un merge conflict

---
 Prolog/README.org | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Prolog/README.org b/Prolog/README.org
index d4f15bd..2ecb26b 100644
--- a/Prolog/README.org
+++ b/Prolog/README.org
@@ -167,10 +167,7 @@ make(Instance, bar, [bar = "69"]). %% Instance = b; false.
 
 ** field
 *** Definizione
-<<<<<<< Updated upstream
 Estrae il valore di una classe da un campo
-=======
->>>>>>> Stashed changes
 
 *** Implementazione
 #+begin_src prolog :tangle oop.pl
-- 
2.52.0