Skip to content

Commit

Permalink
Merge branch 'hotfix/1.3.2' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
	bower.json
	build/rc-sdk-bundle.js
	build/rc-sdk-bundle.js.map
	build/rc-sdk-bundle.min.js
	build/rc-sdk-bundle.min.js.map
	build/rc-sdk.js
	build/rc-sdk.js.map
	build/rc-sdk.min.js
	build/rc-sdk.min.js.map
	gulpfile.js
	package.json
	src/lib/RCSDK.ts
	src/lib/core/Platform.ts
	src/lib/helpers/DeviceModel-spec.ts
  • Loading branch information
kirill-konshin committed Nov 18, 2015
2 parents 4e7af34 + b4cf61b commit 0fca72d
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src-moved/test/lib/AccountGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/// <reference path="../../../src/externals.d.ts" />

declare
var require:(name:string)=>any;
declare var require:(name:string)=>any;

import promise = require('es6-promise');

Expand Down

0 comments on commit 0fca72d

Please sign in to comment.