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

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

diff --git a/src/ClassePrincipale.java b/src/ClassePrincipale.java
index a6daa0a..4947399 100644
--- a/src/ClassePrincipale.java
+++ b/src/ClassePrincipale.java
@@ -1,6 +1,9 @@
 
 public class ClassePrincipale {
 
+	public void deuxFoisRien() {
+		
+	}
 	public static void main(String[] args) {
 		MaJFrame mjf =new MaJFrame();
 		mjf.setVisible(true);