From edc0becdf7badca76c0e65d8f48945365ef30cf3 Mon Sep 17 00:00:00 2001
From: "antoine.gagneux" <antoine.gagneux@ecam.fr>
Date: Wed, 18 Mar 2020 16:34:04 +0100
Subject: [PATCH] commit avec conflit

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

diff --git a/src/ClassePrincipale.java b/src/ClassePrincipale.java
index a6daa0a..7a7ff00 100644
--- a/src/ClassePrincipale.java
+++ b/src/ClassePrincipale.java
@@ -8,5 +8,9 @@ public class ClassePrincipale {
 		//Modification par SAD
 		
 	}
+	
+	public void rien() {
+		
+	}
 
 }