• 18신대성's avatar
    Merge remote-tracking branch 'origin/map' into polish · 425b0e0a
    18신대성 authored
    # Conflicts:
    #	Assets/Prefabs/Objects/Mannequin/stage1_1.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_1.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage1_2.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_2.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage1_3.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_3.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage1_4.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_4.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_1.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_1.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_2.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_2.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_3.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_3.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_4.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_4.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_1.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_1.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_2.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_2.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_3.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_3.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_4.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_4.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_5.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_5.json.meta
    425b0e0a
Name
Last commit
Last update
Assets Loading commit data...
Packages Loading commit data...
ProjectSettings Loading commit data...
.gitignore Loading commit data...