summaryrefslogtreecommitdiff
path: root/src/Doxyfile
diff options
context:
space:
mode:
Diffstat (limited to 'src/Doxyfile')
-rw-r--r--src/Doxyfile6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Doxyfile b/src/Doxyfile
index 0724de1c..90884779 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -832,10 +832,16 @@ EXAMPLE_RECURSIVE = NO
# that contain images that are to be included in the documentation (see the
# \image command).
+<<<<<<< .working
IMAGE_PATH = doc/Skeleton_blocker/ \
doc/Alpha_complex/ \
doc/common/ \
doc/Contraction/
+=======
+IMAGE_PATH = doc/Skeleton_blocker/ \
+ doc/common/ \
+ doc/Contraction/
+>>>>>>> .merge-right.r851
# The INPUT_FILTER tag can be used to specify a program that doxygen should