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

---
 src/ClassePrincipale.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ClassePrincipale.java b/src/ClassePrincipale.java
index 78d02fe..4f2728b 100644
--- a/src/ClassePrincipale.java
+++ b/src/ClassePrincipale.java
@@ -1,9 +1,7 @@
 
 public class ClassePrincipale {
 
-	public void deuxFoisRien() {
-		
-	}
+
 	public static void main(String[] args) {
 		MaJFrame mjf =new MaJFrame();
 		mjf.setVisible(true);
@@ -12,8 +10,6 @@ public class ClassePrincipale {
 		
 	}
 	
-	public void rien() {
-		
-	}
+
 
 }