diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 16:35:16 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 16:35:16 +0000 |
| commit | 9f279b27c8bc98c2ca31b4c5f42c7ab9deeff7ce (patch) | |
| tree | 5eeadd178d4236979a9fadf8f19ea3b5286b6c8e /gpu | |
| parent | d816066264693b5a5f94dcc4fb53926566b258ad (diff) | |
| download | chromium_src-9f279b27c8bc98c2ca31b4c5f42c7ab9deeff7ce.zip chromium_src-9f279b27c8bc98c2ca31b4c5f42c7ab9deeff7ce.tar.gz chromium_src-9f279b27c8bc98c2ca31b4c5f42c7ab9deeff7ce.tar.bz2 | |
Enable auto conflict resolution by last-write-win by default
BUG=177159
TEST=none
Review URL: https://chromiumcodereview.appspot.com/12871007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
0 files changed, 0 insertions, 0 deletions