Skip to content

Commit 1333e75

Browse files
Updated License
1 parent 45e6d65 commit 1333e75

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

LICENSE

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,4 @@
173173
incurred by, or claims asserted against, such Contributor by reason
174174
of your accepting any such warranty or additional liability.
175175

176-
<<<<<<< HEAD
177176
END OF TERMS AND CONDITIONS
178-
=======
179-
END OF TERMS AND CONDITIONS
180-
>>>>>>> ae8070d (Added Apache 2.0 License)

0 commit comments

Comments
 (0)