diff options
| author | Raghav <rmuddur@gmail.com> | 2016-11-04 13:27:08 -0400 |
|---|---|---|
| committer | Raghav <rmuddur@gmail.com> | 2016-11-04 13:27:08 -0400 |
| commit | e0e734fa7feb16375c0809b7b0a3697f654a2ebd (patch) | |
| tree | 0278a4bacfd4341e7e81aed8362b2f9aee5dbbf0 /components/script/dom/plugin.rs | |
| parent | 26dac9854633ea765430021ef99edb431bdf24b7 (diff) | |
| parent | 7c6793fc28423e518a0ceaae1176048fcb2caa3a (diff) | |
| download | servo-e0e734fa7feb16375c0809b7b0a3697f654a2ebd.tar.gz servo-e0e734fa7feb16375c0809b7b0a3697f654a2ebd.zip | |
Remove return and resolve merge conflicts
Since last execution statement is the value which is returned, return
keyword has been removed from method strict_origin and
strict_origin_when_cross_origin.
Merge conflicts in Cargo.lock has been handled
Diffstat (limited to 'components/script/dom/plugin.rs')
0 files changed, 0 insertions, 0 deletions