From: LeonardoBizzoni <71130040+LeonardoBizzoni@users.noreply.github.com>
Date: Sun, 24 Dec 2023 18:06:05 +0000 (+0100)
Subject: missato un merge conflict
X-Git-Url: http://git.leonardobizzoni.com/?a=commitdiff_plain;h=8a587542c8392d3e6b1db68aa4a979c147ad4b37;p=ObjectOriented-Prolog-Lisp

missato un merge conflict
---

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