Adding release requirements from go/releasing/preparing

Change-Id: I2ed51efd0d24b179891faf284d14c6e094d905de
Jigsaw-Code · Nov 26, 2024 · 34ce7bb · 34ce7bb
1 parent 08fc258
commit 34ce7bb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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.