Resolved merge conflicts

Author: REDMOND\lahuey

lib/graph-js-sdk-web.js

@@ -10,8 +10,6 @@ require("isomorphic-fetch");
 var common_1 = require("./common");
 var ResponseHandler_1 = require("./ResponseHandler");
 var RequestMethod_1 = require("./RequestMethod");
-var packageInfo = require('../../package.json');
-
 var GraphRequest = (function () {
     function GraphRequest(config, path) {
         this.config = config;
@@ -321,7 +319,7 @@ var GraphRequest = (function () {
 }());
 exports.GraphRequest = GraphRequest;
 
-},{"../../package.json":11,"./RequestMethod":3,"./ResponseHandler":4,"./common":5,"es6-promise":7,"isomorphic-fetch":8}],3:[function(require,module,exports){
+},{"./RequestMethod":3,"./ResponseHandler":4,"./common":5,"es6-promise":7,"isomorphic-fetch":8}],3:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var RequestMethod;
@@ -334,7 +332,6 @@ var RequestMethod;
 })(RequestMethod = exports.RequestMethod || (exports.RequestMethod = {}));
 
 },{}],4:[function(require,module,exports){
-
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var ResponseHandler = (function () {
@@ -432,7 +429,8 @@ exports.Client = Client;
 __export(require("./GraphRequest"));
 __export(require("./common"));
 __export(require("./ResponseHandler"));
-},{"./GraphRequest":2,"./common":5}],7:[function(require,module,exports){
+
+},{"./GraphRequest":2,"./ResponseHandler":4,"./common":5}],7:[function(require,module,exports){
 (function (process,global){
 /*!
  * @overview es6-promise - a tiny implementation of Promises/A+.
@@ -1791,7 +1789,6 @@ process.umask = function() { return 0; };
 (function(self) {
   'use strict';
 
-
   if (self.fetch) {
     return
   }
@@ -1936,7 +1933,6 @@ process.umask = function() { return 0; };
     return iteratorFor(items)
   }
 
-
   if (support.iterable) {
     Headers.prototype[Symbol.iterator] = Headers.prototype.entries
   }
@@ -2252,36 +2248,4 @@ process.umask = function() { return 0; };
   self.fetch.polyfill = true
 })(typeof self !== 'undefined' ? self : this);
 
-},{}],11:[function(require,module,exports){
-module.exports={
-  "name": "@microsoft/microsoft-graph-client",
-  "version": "1.0.0",
-  "description": "Microsoft Graph Client Library",
-  "main": "lib/src/index.js",
-  "typings": "lib/src/index",
-  "files": [
-    "lib/"
-  ],
-  "types": "./lib/src/index.d.ts",
-  "devDependencies": {
-    "@types/mocha": "^2.2.34",
-    "@types/node": "^9.4.0",
-    "browserify": "^13.1.0",
-    "mocha": "^3.2.0",
-    "typescript": "^2.2.1"
-  },
-  "scripts": {
-    "build": "tsc && node node-browserify.js > lib/graph-js-sdk-web.js",
-    "test": "mocha lib/spec/core",
-    "test:types": "tsc --p spec/types && mocha spec/types"
-  },
-  "dependencies": {
-    "es6-promise": "^4.1.0",
-    "isomorphic-fetch": "^2.2.1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/microsoftgraph/msgraph-sdk-javascript.git"
-  }
-}
 },{}]},{},[1]);

lib/src/GraphRequest.js

@@ -355,7 +355,7 @@ export class GraphRequest {
 
     private configureRequest(request: Request, accessToken:string): Request {
         request.headers.append('Authorization', 'Bearer ' + accessToken);
-        request.headers.append('SdkVersion', "graph-js-" + packageInfo.version);
+        request.headers.append('SdkVersion', "graph-js-" + PACKAGE_VERSION);
 
         Object.keys(this._headers).forEach((key) => request.headers.set(key, this._headers[key] as string));
         return request;