PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fuelgauge OWNERS eof newline merge conflict

Browse Source 
The AOSP version and internal version differ by an end-of-file newline,
which is creating merge conflicts.

Change-Id: Ib90a3ffbae9b44c3e6cf2287149f35318cd320a5
Test: N/A
Merged-In: I330d074c6e504493abf4cece51199ec5851b5d3b
This commit is contained in:
Adam Bookatz
2021-02-20 00:21:36 +00:00
parent c2c5de6199
commit 17e0708152
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/OWNERS
View File

@@ -1,4 +1,4 @@
# Default reviewers for this and subdirectories. # Default reviewers for this and subdirectories.
tifn@google.com tifn@google.com
wesleycwwang@google.com wesleycwwang@google.com
ykhung@google.com ykhung@google.com