Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Vechro 2019-07-21 23:22:41 +03:00 committed by Pfauenauge90
parent 6478c4ec69
commit e37ca1d1f3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/comp/body/object.rs
View File

@ -35,6 +35,7 @@ impl Body {
}
}
<<<<<<< HEAD
<<<<<<< HEAD
const ALL_OBJECTS: [Body; 24] = [
Body::Bomb,
@ -65,3 +66,12 @@ const ALL_OBJECTS: [Body; 24] = [
=======
const ALL_OBJECTS: [Body; 5] = [Body::Bomb, Body::Scarecrow, Body::Chest, Body::Pumpkin, Body::Campfire];
>>>>>>> Add campfire
=======
const ALL_OBJECTS: [Body; 5] = [
Body::Bomb,
Body::Scarecrow,
Body::Chest,
Body::Pumpkin,
Body::Campfire,
];
>>>>>>> formatting