From 419bc0a4cdc0f577062f6c439809f4bf6e3b0c63 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 5 Feb 2020 19:27:16 +0100 Subject: 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. --- lib/strings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/strings.nix') diff --git a/lib/strings.nix b/lib/strings.nix index 6dbb3d3a3e8b6..4f9509ffe7c07 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 "" -- cgit 1.4.1