From 8f65510ee2f509a270b054c38045b4d48d2d36bf Mon Sep 17 00:00:00 2001
From: fedpo2 <federico.nicolas.polidoro@gmail.com>
Date: Thu, 15 Aug 2024 10:12:54 -0300
Subject: [PATCH] =?UTF-8?q?a=C3=B1adido=20apunte=20corto=20discretas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Discreta/1.org | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Discreta/1.org b/Discreta/1.org
index de008c2..e9703c5 100644
--- a/Discreta/1.org
+++ b/Discreta/1.org
@@ -12,3 +12,8 @@ Esta el programa, clase 1
 * Grafos
 Es una grafica de las relaciones entre nodos (ya sean personas,computadoras(da igual)).
 [[./nodos.png]]
+<<<<<<< HEAD
+=======
+
+** Bibliografia
+>>>>>>> 1992309 (añadido apunte corto discretas)