Fixed merge conflict

2026-06-14 18:42:33 +03:00 · 2022-03-09 19:57:04 +02:00
parent 9497729537 d8d43c1ffd
commit 340ad9ec8c
29 changed files with 339 additions and 230 deletions
@@ -13,8 +13,10 @@ describe('instance', function () {
    for (var prop in axios) {
      if ([
        'Axios',
+        'AxiosError',
        'create',
        'Cancel',
+        'CanceledError',
        'CancelToken',
        'isCancel',
        'all',