Switch engine.merge_method back to squash (#24319)

Unfortunately, device lab does not have the capacity for merge method
rebase. It's essentially DoSing device lab: The last engine rebase has
been processing for 6h now and it is still not done :(
This commit is contained in:
Michael Goderbauer 2018-11-13 17:12:36 -08:00 committed by GitHub
parent 1561815e6c
commit f2370c4fa0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1 +1 @@
rebase
squash