fix some conflict

apache · Jun 21, 2024 · e5dd9bb · e5dd9bb
1 parent 6c9024c
commit e5dd9bb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
@@ -1406,6 +1406,10 @@ iot_consensus_throttle_threshold_in_byte=53687091200
 # Datatype: long
 iot_consensus_cache_window_time_in_ms=-1
 
+# Enable Write Ahead Log compression.
+# Option: true, false
+# enable_wal_compression=false
+
 ####################
 ### IoTConsensus Configuration
 ####################