servo: Merge #12205 - resource: Remove the duplicated config from pref.json (from saneyuki:prefs-cleanup); r=frewsxcv

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because
  - just clean up.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9860584edf8e1ae4783d6ac4d75bda6b06da2057
This commit is contained in:
Tetsuharu OHZEKI 2016-07-05 05:10:35 -07:00
parent 0f1c59e62d
commit 1aa79a0460
2 changed files with 0 additions and 2 deletions

View File

@ -23,7 +23,6 @@
"js.throw_on_debuggee_would_run.enabled": false,
"js.dump_stack_on_debuggee_would_run.enabled": false,
"js.werror.enabled": false,
"js.strict.enabled": false,
"js.shared_memory.enabled": true,
"js.mem.high_water_mark": 128,
"js.mem.max": -1,

View File

@ -23,7 +23,6 @@
"js.throw_on_debuggee_would_run.enabled": false,
"js.dump_stack_on_debuggee_would_run.enabled": false,
"js.werror.enabled": false,
"js.strict.enabled": false,
"js.shared_memory.enabled": true,
"js.mem.high_water_mark": 128,
"js.mem.max": -1,