Revert "distributable_lib: consolidate cc-by conflicts"

This reverts commit d6e9913a8b.

CC-BY-4 is GPL-compatible.
This commit is contained in:
Joshua Root
2022-09-19 00:16:17 +10:00
parent f9090fe75f
commit 7fc116fa2a
+4 -1
View File
@@ -41,7 +41,10 @@ array set license_conflicts \
apsl [list agpl cecill gpl] \
beopen [list agpl cecill gpl] \
bsd-old [list agpl cecill gpl] \
cc-by [list agpl cecill gpl] \
cc-by-1 [list agpl cecill gpl] \
cc-by-2 [list agpl cecill gpl] \
cc-by-2.5 [list agpl cecill gpl] \
cc-by-3 [list agpl cecill gpl] \
cc-by-sa [list agpl cecill gpl] \
cddl [list agpl cecill gpl] \
cecill [list afl agpl apache apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1] \