mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-20 07:28:08 +03:00
Merge branch 'beta'
This commit is contained in:
commit
9bd22d35b4
15
package.json
15
package.json
@ -87,7 +87,11 @@
|
||||
"dev-live-reload": "0.47.0",
|
||||
"encoding-selector": "0.21.0",
|
||||
"exception-reporting": "0.37.0",
|
||||
<<<<<<< HEAD
|
||||
"find-and-replace": "0.193.0",
|
||||
=======
|
||||
"find-and-replace": "0.194.0",
|
||||
>>>>>>> beta
|
||||
"fuzzy-finder": "0.93.0",
|
||||
"git-diff": "0.57.0",
|
||||
"go-to-line": "0.30.0",
|
||||
@ -97,8 +101,13 @@
|
||||
"keybinding-resolver": "0.33.0",
|
||||
"line-ending-selector": "0.3.0",
|
||||
"link": "0.31.0",
|
||||
<<<<<<< HEAD
|
||||
"markdown-preview": "0.157.0",
|
||||
"metrics": "0.53.1",
|
||||
=======
|
||||
"markdown-preview": "0.156.1",
|
||||
"metrics": "0.53.0",
|
||||
>>>>>>> beta
|
||||
"notifications": "0.62.1",
|
||||
"open-on-github": "0.40.0",
|
||||
"package-generator": "0.41.0",
|
||||
@ -116,9 +125,15 @@
|
||||
"welcome": "0.33.0",
|
||||
"whitespace": "0.32.1",
|
||||
"wrap-guide": "0.38.1",
|
||||
<<<<<<< HEAD
|
||||
"language-c": "0.51.0",
|
||||
"language-clojure": "0.19.0",
|
||||
"language-coffee-script": "0.46.0",
|
||||
=======
|
||||
"language-c": "0.49.0",
|
||||
"language-clojure": "0.18.0",
|
||||
"language-coffee-script": "0.45.0",
|
||||
>>>>>>> beta
|
||||
"language-csharp": "0.11.0",
|
||||
"language-css": "0.36.0",
|
||||
"language-gfm": "0.82.0",
|
||||
|
@ -171,6 +171,8 @@ function prepareStackTraceWithRawStackAssignment (error, frames) {
|
||||
}
|
||||
}
|
||||
|
||||
Error.stackTraceLimit = 30
|
||||
|
||||
Object.defineProperty(Error, 'prepareStackTrace', {
|
||||
get: function () {
|
||||
return prepareStackTraceWithRawStackAssignment
|
||||
|
Loading…
Reference in New Issue
Block a user