Fixed merge conflicts for PR #16

LBF38 · Jan 4, 2023 · 21362d4 · 21362d4
2 parents 776db93 + 8de4b56
commit 21362d4
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 6 deletions.
diff --git a/duelinvaders/src/main/java/org/enstabretagne/Core/AlienBulletCollision.java b/duelinvaders/src/main/java/org/enstabretagne/Core/AlienBulletCollision.java
@@ -25,7 +25,6 @@ public class AlienBulletCollision extends CollisionHandler {
     /**
      * Constructeur de la classe AlienBulletCollision
      * Elle hérite de la classe CollisionHandler de FXGL
-     * 
      */
     public AlienBulletCollision() {
         super(EntityType.BULLET, EntityType.ALIEN);

diff --git a/duelinvaders/src/main/java/org/enstabretagne/Core/AlienPlayerCollision.java b/duelinvaders/src/main/java/org/enstabretagne/Core/AlienPlayerCollision.java
@@ -22,7 +22,6 @@ public class AlienPlayerCollision extends CollisionHandler {
     /**
      * Constructeur de la classe AlienPlayerCollision
      * Création d'une collision entre les entités player et alien
-     * 
      */
     public AlienPlayerCollision() {
         super(EntityType.PLAYER, EntityType.ALIEN);

diff --git a/duelinvaders/src/main/java/org/enstabretagne/Core/BulletBulletCollision.java b/duelinvaders/src/main/java/org/enstabretagne/Core/BulletBulletCollision.java
@@ -20,7 +20,6 @@
 public class BulletBulletCollision extends CollisionHandler {
     /**
      * Constructeur de la classe BulletBulletCollision
-     *
      */
     public BulletBulletCollision() {
         super(EntityType.BULLET, EntityType.BULLET);

diff --git a/duelinvaders/src/main/java/org/enstabretagne/Core/BulletPlayerCollision.java b/duelinvaders/src/main/java/org/enstabretagne/Core/BulletPlayerCollision.java
@@ -26,7 +26,6 @@
 public class BulletPlayerCollision extends CollisionHandler {
     /**
      * Constructeur de la classe BulletPlayerCollision
-     *
      */
     public BulletPlayerCollision() {
         super(EntityType.BULLET, EntityType.PLAYER);

diff --git a/duelinvaders/src/main/java/org/enstabretagne/Core/EnemyShootBulletCollision.java b/duelinvaders/src/main/java/org/enstabretagne/Core/EnemyShootBulletCollision.java
@@ -20,7 +20,6 @@
 public class EnemyShootBulletCollision extends CollisionHandler {
     /**
      * Constructeur de la classe EnemyShootBulletCollision
-     *
      */
     public EnemyShootBulletCollision() {
         super(EntityType.BULLET, EntityType.ENEMY_SHOOT);

diff --git a/duelinvaders/src/main/java/org/enstabretagne/Core/EnemyShootPlayerCollision.java b/duelinvaders/src/main/java/org/enstabretagne/Core/EnemyShootPlayerCollision.java
@@ -23,7 +23,6 @@
 public class EnemyShootPlayerCollision extends CollisionHandler {
     /**
      * Constructeur de la classe EnemyShootPlayerCollision
-     * 
      */
     public EnemyShootPlayerCollision() {
         super(EntityType.ENEMY_SHOOT, EntityType.PLAYER);