Skip to content

Commit a3f7e2a

Browse files
LPLafontaineBLPLafontaineB
committed
fixing conflict
1 parent f7e6413 commit a3f7e2a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎Assets/BossRoom/Scenes/Startup.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7d8d00bf64d261c83f7aa5f58a01bd6b1c8ed43a467c568dc091c3a1212a3339
3-
size 41957
2+
oid sha256:32babadcab3d292929fba394a38a07591ccd99d0a7f3a62e39a951b41d0bcb9b
3+
size 43795

0 commit comments

Comments
 (0)