Switch engine.merge_method back to squash (flutter#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 :(
hhjay · Nov 14, 2018 · f2370c4 · f2370c4
1 parent 1561815
commit f2370c4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bin/internal/engine.merge_method b/bin/internal/engine.merge_method
@@ -1 +1 @@
-rebase
+squash