fixing merge conflict

This commit is contained in:
Joseph Rafferty 2024-01-29 22:12:04 -05:00
commit 8ac43b5bd2
61 changed files with 155 additions and 29 deletions

BIN
Content/Brigitte_Models/User/Boolean_1D1729B4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Brigitte_Models/User/Box_0AC1B77E.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Brigitte_Models/User/Box_C68803D9.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Brigitte_Models/User/C_InsideCut.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Brigitte_Models/User/C_TunnelBase.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Brigitte_Models/User/Cone_7F6AF2E6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Brigitte_Models/User/WallSegment_200.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Brigitte_Models/User/Y_Capillary.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.