minor typo fixed (#258)

charts/csi-vxflexos/values.yaml

@@ -51,6 +51,24 @@ externalAccess:
 # Default value: None
 imagePullPolicy: IfNotPresent
 
+<<<<<<< HEAD
+=======
+# nfsAcls: enables setting permissions on NFS mount directory
+# This value acts as default value for NFS ACL (nfsAcls), if not specified for an array config in secret
+# Permissions can be specified in two formats:
+#   1) Unix mode (NFSv3)
+#   2) NFSv4 ACLs (NFSv4)
+#      NFSv4 ACLs are supported on NFSv4 share only.
+# Allowed values:
+#   1) Unix mode: valid octal mode number
+#      Examples: "0777", "777", "0755"
+#   2) NFSv4 acls: valid NFSv4 acls, separated by comma
+#      Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
+# Optional: true
+# Default value: "0777"
+nfsAcls: "0777"
+
+>>>>>>> b9b7e1f (minor typo fixed (#258))
 # enableQuota: a boolean that, when enabled, will set quota limit for a newly provisioned NFS volume.
 # Allowed values:
 #   true: set quota for volume