aboutsummaryrefslogtreecommitdiff
path: root/license
diff options
context:
space:
mode:
authorheavydemon21 <nielsstunnebrink1@gmail.com>2024-12-19 14:01:35 +0100
committerheavydemon21 <nielsstunnebrink1@gmail.com>2024-12-19 14:01:35 +0100
commitb6d3bc08126652ed42a7c84f5e4a8283e5e74d22 (patch)
tree747e5ba495fb5d343da40d10e478af9f655f70cc /license
parentb5c4879189a8ff55434c8c04c14163dfda83de65 (diff)
fix merge conflict
Diffstat (limited to 'license')
0 files changed, 0 insertions, 0 deletions