From e292d3b47bd81a26064db31fe4eb5ee6326e76db Mon Sep 17 00:00:00 2001
From: "antoine.gagneux" <antoine.gagneux@ecam.fr>
Date: Wed, 18 Mar 2020 16:39:29 +0100
Subject: [PATCH] conflit

---
 src/ClassePrincipale.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ClassePrincipale.java b/src/ClassePrincipale.java
index 4f2728b..8022887 100644
--- a/src/ClassePrincipale.java
+++ b/src/ClassePrincipale.java
@@ -10,6 +10,8 @@ public class ClassePrincipale {
 		
 	}
 	
-
+	public void autreRien() {
+		
+	}
 
 }