Skip to content
This repository was archived by the owner on Jun 1, 2020. It is now read-only.

Commit 984dc5d

Browse files
committed
Resolve conflict
2 parents 52ead6c + da2d481 commit 984dc5d

File tree

3 files changed

+1532
-1597
lines changed

3 files changed

+1532
-1597
lines changed

example/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4855,9 +4855,9 @@ safe-regex@^1.1.0:
48554855
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
48564856

48574857
safer-eval@^1.3.0:
4858-
version "1.3.3"
4859-
resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.3.tgz#0309e9fcc0609e66c1b599fd0d4772132b260ca8"
4860-
integrity sha512-j/qb0rtnwTp5V1D7nR0Ns/14HU8OiHPaoZNJhM+Lfmv1nbXZCXG9LHaVW157agEocdSVAeeRNddK/yuWfalzGQ==
4858+
version "1.3.5"
4859+
resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.5.tgz#a75a1193a4e1dfadd34a8c87ad08e7b978c494b1"
4860+
integrity sha512-BJ//K2Y+EgCbOHEsDGS5YahYBcYy7JcFpKDo2ba5t4MnOGHYtk7HvQkcxTDFvjQvJ0CRcdas/PyF+gTTCay+3w==
48614861
dependencies:
48624862
clones "^1.2.0"
48634863

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"react-dom": "^16.8.6",
4040
"react-jsonschema-form": "^1.6.1",
4141
"rimraf": "^3.0.0",
42-
"tsdx": "^0.7.2",
42+
"tsdx": "^0.10.5",
4343
"tslib": "^1.10.0",
4444
"typescript": "^3.5.3"
4545
},

0 commit comments

Comments
 (0)