kaazing / javascript.client

Apache License 2.0
21 stars 16 forks source link

resolving conflicts #23

Closed ghost closed 9 years ago

ghost commented 9 years ago

trying to resolve conflict from previous merge request: https://github.com/kaazing/javascript.client/pull/16