From 17e07081521249bf4b6edec8ebd70e93ef0477d7 Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Sat, 20 Feb 2021 00:21:36 +0000 Subject: [PATCH] fuelgauge OWNERS eof newline merge conflict 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 --- src/com/android/settings/fuelgauge/OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/fuelgauge/OWNERS b/src/com/android/settings/fuelgauge/OWNERS index 237d35309cf..ab3da898aac 100644 --- a/src/com/android/settings/fuelgauge/OWNERS +++ b/src/com/android/settings/fuelgauge/OWNERS @@ -1,4 +1,4 @@ # Default reviewers for this and subdirectories. tifn@google.com wesleycwwang@google.com -ykhung@google.com \ No newline at end of file +ykhung@google.com