Fix merge conflict and use screenshots

gamelost · Mar 14, 2015 · 48767ba · 48767ba
1 parent 46099f3
commit 48767ba
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/Content/GLCArena/Blueprints/Bullet.uasset b/Content/GLCArena/Blueprints/Bullet.uasset
diff --git a/Content/GLCArena/Blueprints/PlayerCapsule.uasset b/Content/GLCArena/Blueprints/PlayerCapsule.uasset