Skip to content
Snippets Groups Projects
Commit 1970a389 authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

Merge branch 'master' of https://gitlab.demlabs.net/dapcash/dapcash-node into release-4.3

parents 32a7ba5a b214da51
No related branches found
No related tags found
No related merge requests found
Pipeline #7031 failed with stages
Stage: analyze
    Stage: build
      in 4 minutes and 38 seconds
      Hide whitespace changes
      Inline Side-by-side
      dist/share/configs/dapcash-node.cfg.tpl
      + 0
      − 12
      View file @ 1970a389
      ......@@ -15,18 +15,6 @@ debug_chain_sync=false
      # Auto bring up links and sync everything over them
      auto_online={AUTO_ONLINE}
      <<<<<<< HEAD
      =======
      # Ledger defaults
      [ledger]
      # More debug output
      debug_more=false
      [dag]
      # More debug output
      debug_more=false
      >>>>>>> b214da51b60d67943d44fb4bd305b2b3e62cf7a3
      # Server part
      [server]
      # By default you don't need to open you to the world
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment