about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-02-05 19:27:16 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-02-05 19:41:25 +0100
commit419bc0a4cdc0f577062f6c439809f4bf6e3b0c63 (patch)
tree0f39c63fcddea75c562825d53a3f36bbba8b7930 /lib
parent873e6a4e65451be32e8dcd6151e1f26262ef35f2 (diff)
downloadnixlib-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar
nixlib-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.gz
nixlib-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.bz2
nixlib-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.lz
nixlib-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.xz
nixlib-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.zst
nixlib-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.zip
Revert "Revert "Merge master into staging-next""
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a570d6cf81d229ad22a8889602639160 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master.

This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
Diffstat (limited to 'lib')
-rw-r--r--lib/strings.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/strings.nix b/lib/strings.nix
index 6dbb3d3a3e8b..4f9509ffe7c0 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -244,7 +244,7 @@ rec {
      Also note that Nix treats strings as a list of bytes and thus doesn't
      handle unicode.
 
-     Type: stringtoCharacters :: string -> [string]
+     Type: stringToCharacters :: string -> [string]
 
      Example:
        stringToCharacters ""