mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 08:50:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #507 from Hongarc/object-assign

Browse source 
Remove module object-assign
This commit is contained in:
Peter Cottle 2018-11-30 12:23:04 -08:00 • committed by GitHub
commit 7ae05ce932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -33,7 +33,6 @@
"flux": "^2.0.1",
"jquery": "~1.7.3",
"markdown": "~0.4.0",
"object-assign": "^2.0.0",
"q": "~0.8.11",
"react": "^0.13.1",
"underscore": "~1.4.3"

3
src/js/app/index.js
View file

@ -2,7 +2,6 @@ var Backbone = require('backbone');
var EventEmitter = require('events').EventEmitter;
var React = require('react');
var assign = require('object-assign');
var util = require('../util');
var intl = require('../intl');
var LocaleStore = require('../stores/LocaleStore');
@ -11,7 +10,7 @@ var LocaleActions = require('../actions/LocaleActions');
/**
* Globals
*/
var events = assign(
var events = Object.assign(
{},
EventEmitter.prototype,
{