krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Create merge function

Browse Source
This commit is contained in:
Blade Barringer
2015-09-22 13:00:46 -05:00
parent ed5abf44e1
commit 7948e8a8e2
6 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/script/src/content/food/index.js
View File

@@ -1,16 +1,14 @@
import {each, defaults, assign} from 'lodash';
import {translator as t} from '../helpers';
import {each, defaults} from 'lodash';
import {
translator as t,
merge
} from '../helpers';
import baseFood from './base';
import saddle from './saddle';
import cake from './birthday';
import candy from './fall';
let allFood = {};
assign(allFood, baseFood);
assign(allFood, saddle);
assign(allFood, cake);
assign(allFood, candy);
let allFood = merge([baseFood, saddle, cake, candy]);
export default allFood;