From 2f1ebe30e78c8732250e08724dfd33e6b1149eb1 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 1 Apr 2024 17:20:39 +0100 Subject: [PATCH] Merged Conflicts in Apartment_Hit level --- .../ApartmentBounty/BountySpecificActors/BP_Elevator.uasset | 4 ++-- EndlessVendetta/Content/Levels/Apartment_Copy.umap | 4 ++-- EndlessVendetta/Content/Levels/Apartment_hit.umap | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset index 79340270..42979ca1 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb89985ff59f09c89e985a8a0ed0229acec364ac9eb3442020dc8cb44aa8c53 -size 92950 +oid sha256:467847155b59a2b4c40084f4b9edbc392277699f1f214e474b200b30f2060419 +size 90966 diff --git a/EndlessVendetta/Content/Levels/Apartment_Copy.umap b/EndlessVendetta/Content/Levels/Apartment_Copy.umap index b760bb2b..6df972fc 100644 --- a/EndlessVendetta/Content/Levels/Apartment_Copy.umap +++ b/EndlessVendetta/Content/Levels/Apartment_Copy.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69a8b59a64e4415fef97fdc5c9fb46052fe7ce9a401fff2887e3653bdd8e7ac4 -size 1014750 +oid sha256:72968a027a92c529540b36fdd1e857bf3a4dacc8d13322d93256080e8b65fa67 +size 1016047 diff --git a/EndlessVendetta/Content/Levels/Apartment_hit.umap b/EndlessVendetta/Content/Levels/Apartment_hit.umap index 3993b0e0..f581b942 100644 --- a/EndlessVendetta/Content/Levels/Apartment_hit.umap +++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95b75f9a1a08c92e493a38a2f257201075afc362b2c91d7c74b3d703f3e6cb42 -size 946769 +oid sha256:921f30bca370f876f4abc448998a1622cffe9ffd057e29c6558f609cd254faa8 +size 1013286 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 34db32d6..b94e43f8 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72bcebfcdf8f1394397cbeff102dfb3c52994a546f876065aeb689f7f9cd0aaa -size 268 +oid sha256:5afecf219ef2d0742c697011ed405744fe41fd3f34484d1066cb1879e05edfdf +size 66790690