Merge lp:~marcustomlinson/unity-js-scopes/lp-1506047 into lp:unity-js-scopes

Proposed by Marcus Tomlinson on 2015-11-20
Status: Merged
Merged at revision: 116
Proposed branch: lp:~marcustomlinson/unity-js-scopes/lp-1506047
Merge into: lp:unity-js-scopes
Diff against target: 11 lines (+0/-1)
1 file modified
src/bindings/src/addon.cc (+0/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-js-scopes/lp-1506047
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2015-11-20 Approve on 2015-11-20
PS Jenkins bot (community) continuous-integration Approve on 2015-11-20
Review via email: mp+278136@code.launchpad.net

Commit message

Removed duplicate CategorisedResult binding causing a runtime error with debug builds

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bindings/src/addon.cc'
2--- src/bindings/src/addon.cc 2015-11-08 15:49:12 +0000
3+++ src/bindings/src/addon.cc 2015-11-20 12:12:01 +0000
4@@ -434,7 +434,6 @@
5 module.add_class("Category", category);
6 module.add_class("CategorisedResult", categorised_result);
7 module.add_class("CannedQuery", canned_query);
8- module.add_class("CategorisedResult", categorised_result);
9 module.add_class("CategoryRenderer", category_renderer);
10 module.add_class("ColumnLayout", column_layout);
11 module.add_class("Department", department);

Subscribers

People subscribed via source and target branches

to all changes: