Merge branch 'master' of

https://gitarero.ecam.fr/dorian.veloso/OOP_F5_Project.git
2024-04-10 15:42:36 +02:00 · 2024-04-10 15:42:36 +02:00 · 5255380f06
parent 1227f25a23 3dd8459e28
commit 5255380f06
2 changed files with 1 additions and 0 deletions
--- a/dorian.txt
+++ b/dorian.txt
--- a/src/Main.java
+++ b/src/Main.java
@ -8,5 +8,6 @@ public class Main {
 		MyInterface mjf = new MyInterface();
 		mjf.setVisible(true);
 	}
+	// comment for pull/push trial

 }