From 34ce7bb1443500e678911158267247389f82bf55 Mon Sep 17 00:00:00 2001
From: alyssachvasta <achvasta@google.com>
Date: Wed, 21 Aug 2024 20:22:59 +0000
Subject: [PATCH] Adding release requirements from go/releasing/preparing

Change-Id: I2ed51efd0d24b179891faf284d14c6e094d905de
---
 LICENSE | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 4a61ce4..329d04f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,11 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-<<<<<<< HEAD
-   Copyright [yyyy] [name of copyright owner]
-=======
    Copyright 2024 Jigsaw
->>>>>>> f744e1c (Adding release requirements from go/releasing/preparing)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.