From: Petter Reinholdtsen Date: Wed, 24 Jul 2013 09:45:15 +0000 (+0200) Subject: resolve conflict. X-Git-Tag: edition-2015-10-10~977 X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/e2ab7b94338f8e839d19337152f374366b69512a?hp=6e7707022bf2009b9fd04fd2b2df464db7b5a271 resolve conflict. --- diff --git a/images/1331.svg b/images/1331.svg new file mode 100644 index 0000000..8c8a05b --- /dev/null +++ b/images/1331.svg @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Arkitektur + + Jus + + + Moral + Marked + + + + + + + diff --git a/images/1361.svg b/images/1361.svg new file mode 100644 index 0000000..b1cc09f --- /dev/null +++ b/images/1361.svg @@ -0,0 +1,748 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Arkitektur + + Jus + + + Moral + + + + Marked + + + + + + + + + + + + diff --git a/images/1381.svg b/images/1381.svg new file mode 100644 index 0000000..733fb72 --- /dev/null +++ b/images/1381.svg @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Arkitektur + + Jus + + + Moral + Marked + + + diff --git a/images/1442.svg b/images/1442.svg new file mode 100644 index 0000000..513208a --- /dev/null +++ b/images/1442.svg @@ -0,0 +1,446 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Arkitektur + + Jus + + + Moral + Marked + + + diff --git a/images/1521.svg b/images/1521.svg new file mode 100644 index 0000000..f4cf335 --- /dev/null +++ b/images/1521.svg @@ -0,0 +1,76 @@ + + + + + + + + + + image/svg+xml + + + + + + + + bruksområder + + diff --git a/images/1531.svg b/images/1531.svg new file mode 100644 index 0000000..48552cd --- /dev/null +++ b/images/1531.svg @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + uregulert + les + gi bort + selg + sov + + 5 kr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +