Solved merge conflicts

alphamanuscript · Aug 28, 2018 · c5238d4 · c5238d4
1 parent a233716
commit c5238d4
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 139 deletions.
diff --git a/build/dist-esm/index.d.ts b/build/dist-esm/index.d.ts
diff --git a/build/dist-esm/index.js b/build/dist-esm/index.js
diff --git a/build/dist-esm/index.js.map b/build/dist-esm/index.js.map
diff --git a/build/dist-esm/src/requests.d.ts b/build/dist-esm/src/requests.d.ts
diff --git a/build/dist-esm/src/requests.js b/build/dist-esm/src/requests.js
diff --git a/build/dist-esm/src/requests.js.map b/build/dist-esm/src/requests.js.map
diff --git a/build/dist-esm/src/service.d.ts b/build/dist-esm/src/service.d.ts
diff --git a/build/dist/index.js b/build/dist/index.js
diff --git a/build/dist/index.js.map b/build/dist/index.js.map
diff --git a/build/dist/src/requests.js b/build/dist/src/requests.js
diff --git a/build/dist/src/requests.js.map b/build/dist/src/requests.js.map
diff --git a/dist/surix-tools.js → dist/client-service.js b/dist/surix-tools.js → dist/client-service.js
diff --git a/dist/client-service.js.map b/dist/client-service.js.map
diff --git a/dist/surix-tools.min.js → dist/client-service.min.js b/dist/surix-tools.min.js → dist/client-service.min.js