FenetreCloseOperation
	modified:   src/main/java/fr/insaif/jajagaa/view/Fenetre.java
	modified:   src/main/java/fr/insaif/jajagaa/view/VueNoeud.java
	modified:   src/main/java/fr/insaif/jajagaa/view/VuePlan.java
	modified:   src/main/java/fr/insaif/jajagaa/view/panelDroite/ListNoeuds.java
Résolution conflits
Merge branch 'master' of github.com:IF-JAJAGA/devoo

Conflicts:
	src/main/java/fr/insaif/jajagaa/view/Fenetre.java

Résolution conflits