fix: conflict
Showing
- Assets/ImportPackage/Particlecollection_Free samples/Prefab/Line/Line_003.prefab 4 additions, 4 deletions...rticlecollection_Free samples/Prefab/Line/Line_003.prefab
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE.meta 0 additions, 0 deletionsAssets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2.meta 0 additions, 0 deletions.../ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0005.wav 0 additions, 0 deletions...und Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0005.wav
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0005.wav.meta 0 additions, 0 deletions...ackages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0005.wav.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0017.wav 0 additions, 0 deletions...und Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0017.wav
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0017.wav.meta 0 additions, 0 deletions...ackages/FUTURE_BEEPS_LITE/R2D2/R2D2_Complex_0017.wav.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0008.wav 0 additions, 0 deletions.../Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0008.wav
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0008.wav.meta 0 additions, 0 deletions...d Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0008.wav.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0019.wav 0 additions, 0 deletions.../Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0019.wav
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0019.wav.meta 0 additions, 0 deletions...d Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_High_0019.wav.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0004.wav 0 additions, 0 deletions...e/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0004.wav
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0004.wav.meta 0 additions, 0 deletions...nd Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0004.wav.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0005.wav 0 additions, 0 deletions...e/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0005.wav
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0005.wav.meta 0 additions, 0 deletions...nd Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0005.wav.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0014.wav 0 additions, 0 deletions...e/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0014.wav
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0014.wav.meta 0 additions, 0 deletions...nd Packages/FUTURE_BEEPS_LITE/R2D2/R2D2_Low_0014.wav.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/Read_Me.txt 0 additions, 0 deletions...mportPackage/Sound Packages/FUTURE_BEEPS_LITE/Read_Me.txt
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/Read_Me.txt.meta 0 additions, 0 deletions...Package/Sound Packages/FUTURE_BEEPS_LITE/Read_Me.txt.meta
- Assets/ImportPackage/Sound Packages/FUTURE_BEEPS_LITE/Repeating_Beeps.meta 0 additions, 0 deletions...age/Sound Packages/FUTURE_BEEPS_LITE/Repeating_Beeps.meta
Please register or sign in to comment