Chromium Code Reviews| Index: components/search_engines/prepopulated_engines.json |
| diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json |
| index 721bfd6082443234475864ab7f88391a634c97d2..a8ca6f74a34ab2b71a65c5d2b991a89fed84b4df 100644 |
| --- a/components/search_engines/prepopulated_engines.json |
| +++ b/components/search_engines/prepopulated_engines.json |
| @@ -30,7 +30,7 @@ |
| // Increment this if you change the data in ways that mean users with |
| // existing data should get a new version. |
| - "kCurrentDataVersion": 91 |
|
Alexander Yashkin
2016/06/15 06:55:23
kCurrentDataVersion becomes 90 with previous versi
|
| + "kCurrentDataVersion": 90 |
|
Peter Kasting
2016/06/15 09:18:12
Yeah, this is some kind of bad merge conflict reso
|
| }, |
| // The following engines are included in country lists and are added to the |