fix git conflict

[c11tester.git] / config.h

diff --git a/config.h b/config.h
index afbac874d785b3a31b7af13a7c284f30ac51ff2f..43c044278eac3350d507309f86a9b05582308ca8 100644 (file)
--- a/config.h
+++ b/config.h
@@ -7,13 +7,13 @@
 
 /** Turn on debugging. */
 /*             #ifndef CONFIG_DEBUG
-               #define CONFIG_DEBUG
-               #endif
+ #define CONFIG_DEBUG
+ #endif
 
-               #ifndef CONFIG_ASSERT
-               #define CONFIG_ASSERT
-               #endif
-*/
+ #ifndef CONFIG_ASSERT
+ #define CONFIG_ASSERT
+ #endif
+ */
 
 /** Turn on support for dumping cyclegraphs as dot files at each
  *  printed summary.*/
@@ -27,11 +27,11 @@
 #else
 #define BIT48 0
 #endif
-#endif /* BIT48 */
+#endif /* BIT48 */
 
 /** Snapshotting configurables */
 
-/** 
+/**
  * If USE_MPROTECT_SNAPSHOT=2, then snapshot by tuned mmap() algorithm
  * If USE_MPROTECT_SNAPSHOT=1, then snapshot by using mmap() and mprotect()
  * If USE_MPROTECT_SNAPSHOT=0, then snapshot by using fork() */