fixed merge conflicts. Deleted 'generated' directory

dvillavicencio · Feb 16, 2024 · 2d0f12d · 2d0f12d
1 parent 45cbb30
commit 2d0f12d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 65 deletions.
diff --git a/src/main/generated/com/danielvm/destiny2bot/mapper/CharacterInfoMapperImpl.java b/src/main/generated/com/danielvm/destiny2bot/mapper/CharacterInfoMapperImpl.java
diff --git a/src/main/generated/com/danielvm/destiny2bot/mapper/VaultWeaponMapperImpl.java b/src/main/generated/com/danielvm/destiny2bot/mapper/VaultWeaponMapperImpl.java
diff --git a/src/main/resources/static/.DS_Store b/src/main/resources/static/.DS_Store
diff --git a/src/test/java/com/danielvm/destiny2bot/integration/BaseIntegrationTest.java b/src/test/java/com/danielvm/destiny2bot/integration/BaseIntegrationTest.java
@@ -58,9 +58,6 @@ public abstract class BaseIntegrationTest {
   @Autowired
   WebTestClient webTestClient;
 
-  @Autowired
-  ReactiveWebApplicationContext reactiveWebApplicationContext;
-
   @Autowired
   ObjectMapper objectMapper;