Fix copyright header

Change-Id: I70a0732f67617a96b6dd20eccbc6c02a9dafdabd
2 years ago · 5e28769831
parent 86fe3b2152
commit 5e28769831
1 changed files with 0 additions and 4 deletions
--- a/feature/search/src/main/res/values/strings.xml
+++ b/feature/search/src/main/res/values/strings.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-<<<<<<< HEAD
     Copyright 2023 The Android Open Source Project
-=======
-     Copyright 2022 The Android Open Source Project
->>>>>>> b23ba8b2 (Add UI skeleton for the search feature)

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.