Skip to content

Commit c002a0a

Browse files
committed
Fix merge conflict in LICENSE
2 parents de55dbc + a40fe3f commit c002a0a

1 file changed

Lines changed: 22 additions & 0 deletions

File tree

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,13 @@
137137

138138
6. Trademarks. This License does not grant permission to use the trade
139139
names, trademarks, service marks, or product names of the Licensor,
140+
<<<<<<< HEAD
140141
except as required for describing the origin of the Work and
141142
reproducing the content of the NOTICE file.
143+
=======
144+
except as required for reasonable and customary use in describing the
145+
origin of the Work and reproducing the content of the NOTICE file.
146+
>>>>>>> a40fe3ff12a058bf01d6588a907f618f7b09dfa1
142147

143148
7. Disclaimer of Warranty. Unless required by applicable law or
144149
agreed to in writing, Licensor provides the Work (and each
@@ -162,6 +167,7 @@
162167
other commercial damages or losses), even if such Contributor
163168
has been advised of the possibility of such damages.
164169

170+
<<<<<<< HEAD
165171
9. Accepting Warranty or Support. While redistributing the Work or
166172
Derivative Works thereof, You may choose to offer, and charge a
167173
fee for, acceptance of support, warranty, indemnity, or other
@@ -172,6 +178,18 @@
172178
and hold each Contributor harmless for any liability incurred by,
173179
or claims asserted against, such Contributor by reason of your
174180
accepting any such warranty or support.
181+
=======
182+
9. Accepting Warranty or Additional Liability. While redistributing
183+
the Work or Derivative Works thereof, You may choose to offer,
184+
and charge a fee for, acceptance of support, warranty, indemnity,
185+
or other liability obligations and/or rights consistent with this
186+
License. However, in accepting such obligations, You may act only
187+
on Your own behalf and on Your sole responsibility, not on behalf
188+
of any other Contributor, and only if You agree to indemnify,
189+
defend, and hold each Contributor harmless for any liability
190+
incurred by, or claims asserted against, such Contributor by reason
191+
of your accepting any such warranty or additional liability.
192+
>>>>>>> a40fe3ff12a058bf01d6588a907f618f7b09dfa1
175193

176194
END OF TERMS AND CONDITIONS
177195

@@ -186,7 +204,11 @@
186204
same "printed page" as the copyright notice for easier
187205
identification within third-party archives.
188206

207+
<<<<<<< HEAD
189208
Copyright 2026 Ömer Kuru
209+
=======
210+
Copyright [yyyy] [name of copyright owner]
211+
>>>>>>> a40fe3ff12a058bf01d6588a907f618f7b09dfa1
190212

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

0 commit comments

Comments
 (0)