resolved merge conflict

fractalego · Dec 29, 2023 · a63abd0 · a63abd0
1 parent fb8cf0a
commit a63abd0
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/documentation/build/doctrees/environment.pickle b/documentation/build/doctrees/environment.pickle