diff options
| author | Nathan Harold <nharold@google.com> | 2020-01-09 18:59:44 -0800 |
|---|---|---|
| committer | Nathan Harold <nharold@google.com> | 2020-01-10 23:07:05 +0000 |
| commit | 1fd6b723df993482a589548ccabec88beda6b362 (patch) | |
| tree | 0f0601b3b7d2b79d2cf701408deef381463b0596 /identity/support/include/cppbor/cppbor.h | |
| parent | 232cfebd5b357a05bd48322ffc3ee715a72cf3a5 (diff) | |
Add Some Buffer Lines to Avoid Merge Conflicts
Because other teams are changing HAL hashes downstream,
the git conflict resolution algorithm detects conflicts
due to changes in adjacent lines, even though they aren't
real conflicts. This CL adds buffer lines to convince git
and by extension the auto-merger that the changes may be
safely merged.
Note: these should be removed prior to release.
Bug: 144366823
Test: make (non-functional change)
Merged-In: Ie8785da99ce68e1db85face30c6c633385ecb085
Change-Id: Ie8785da99ce68e1db85face30c6c633385ecb085
(cherry picked from commit 857821c288f8279ad6d142a73b4ba2c5f10159ce)
Diffstat (limited to 'identity/support/include/cppbor/cppbor.h')
0 files changed, 0 insertions, 0 deletions