fix merge conflicts

xou816 · Feb 12, 2023 · f51ad03 · f51ad03
1 parent ae74b41
commit f51ad03
Show file tree

Hide file tree

Showing 3 changed files with 370 additions and 183 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -17,4 +17,5 @@ Fridolin Weisser
 Jan Przebor
 Warren Hu
 bbb651
-Julius Rüberg
+Julius Rüberg
+janbrummer