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

7
common/script/src/content/eggs/index.js
View File

@@ -1,12 +1,9 @@
import {assign} from 'lodash';
import {merge} from '../helpers';
import dropEggs from './drops';
import questEggs from './quest';
let allEggs = {};
assign(allEggs, dropEggs);
assign(allEggs, questEggs);
let allEggs = merge([dropEggs, questEggs]);
export default {
allEggs: allEggs,