Skip to content

Commit 34919ca

Browse files
lemirelemire
authored
Update README.md
1 parent 0d1c574 commit 34919ca

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

‎README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,3 @@ This code is made available under the Apache License 2.0.
188188
Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it under the liberal (business-friendly) MIT license.
189189
190190
For compilers that do not support C++17, we bundle the string-view library which is published under the Boost license (http://www.boost.org/LICENSE_1_0.txt). Like the Apache license, the Boost license is a permissive license allowing commercial redistribution.
191-
<<<<<<< HEAD
192-
=======
193-
194-
>>>>>>> 832bbe734dfc9719d9428ad38368602169594788

0 commit comments

Comments
 (0)