From 5e287698317bd945e11da31d9241f79508e62312 Mon Sep 17 00:00:00 2001
From: Takeshi Hagikura <thagikura@google.com>
Date: Fri, 7 Apr 2023 14:24:17 +0900
Subject: [PATCH] Fix copyright header

Change-Id: I70a0732f67617a96b6dd20eccbc6c02a9dafdabd
---
 feature/search/src/main/res/values/strings.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/feature/search/src/main/res/values/strings.xml b/feature/search/src/main/res/values/strings.xml
index 4f571c4aa..e97f97089 100644
--- 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.