resolve merge conflict

Legal/GDPR.md

@@ -0,0 +1,16 @@
+# GDPR
+
+* All personal data or data which can be used to identify a person
+* Collection must be for specific use case(s)
+* Needs to be accurate (updated)
+* Data mustn't be stored longer than necessary OR for archiving, or statistical purposes.
+* User must be allowed to request deletion (store datetime for interval analysis)
+* Data must be optional unless absolutely required (e.g. HR data, customer info for invoice etc.). All other data requires approval by holder.
+* Must be at least 16 years old
+* Inform breach after 72 hours
+
+## Processing
+
+* Consent must be given by person (this consent needs to be able to demonstrate). Therefore it must be a activation checkbox and not a deactivation checkbox.
+* Must be necessary for the contract (e.g. writing invoice etc.)
+* User may request what data is stored

Legal/Licensees.md

@@ -1,4 +1,4 @@
-# Licenses #
+# Licensees #
 
 ## Schütz Dental GmbH
 

Legal/Licensors.md

@@ -1,4 +1,4 @@
-# Licenses #
+# Licensors #
 
 ## Fonts ##
 
@@ -57,4 +57,4 @@ Core PHP libraries
 
 * Files: PHPPresentation/*
 * License: https://github.com/PHPOffice/PHPPresentation/blob/develop/LICENSE
-* Source: https://github.com/PHPOffice/PHPPresentation
+* Source: https://github.com/PHPOffice/PHPPresentation