mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-28 00:40:07 +02:00
Remove module object-assign
This commit is contained in:
parent
e8c8f8975a
commit
4c92196559
2 changed files with 1 additions and 3 deletions
|
@ -33,7 +33,6 @@
|
||||||
"flux": "^2.0.1",
|
"flux": "^2.0.1",
|
||||||
"jquery": "~1.7.3",
|
"jquery": "~1.7.3",
|
||||||
"markdown": "~0.4.0",
|
"markdown": "~0.4.0",
|
||||||
"object-assign": "^2.0.0",
|
|
||||||
"q": "~0.8.11",
|
"q": "~0.8.11",
|
||||||
"react": "^0.13.1",
|
"react": "^0.13.1",
|
||||||
"underscore": "~1.4.3"
|
"underscore": "~1.4.3"
|
||||||
|
|
|
@ -2,7 +2,6 @@ var Backbone = require('backbone');
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
var React = require('react');
|
var React = require('react');
|
||||||
|
|
||||||
var assign = require('object-assign');
|
|
||||||
var util = require('../util');
|
var util = require('../util');
|
||||||
var intl = require('../intl');
|
var intl = require('../intl');
|
||||||
var LocaleStore = require('../stores/LocaleStore');
|
var LocaleStore = require('../stores/LocaleStore');
|
||||||
|
@ -11,7 +10,7 @@ var LocaleActions = require('../actions/LocaleActions');
|
||||||
/**
|
/**
|
||||||
* Globals
|
* Globals
|
||||||
*/
|
*/
|
||||||
var events = assign(
|
var events = Object.assign(
|
||||||
{},
|
{},
|
||||||
EventEmitter.prototype,
|
EventEmitter.prototype,
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue