Remove conflict msg

2014-12-25 18:25:46 +08:00
parent 1c6f69ceea
commit dfe756a3b0
1 changed files with 2 additions and 1 deletions
--- a/config.yaml
+++ b/config.yaml
@@ -116,10 +116,11 @@ options:
      This network will be used for tenant network traffic in overlay
      networks.
  sysctl:
+    type: string
    default:
    description: |
      YAML-formatted associative array of sysctl key/value pairs to be set
-      persistently e.g. '{ kernel.pid_max : 4194303 }'.>>>>>>> MERGE-SOURCE
+      persistently e.g. '{ kernel.pid_max : 4194303 }'.
  # Legacy HA
  ha-legacy-mode:
    type: boolean