ft: fix conflict

bolorundurowb · Aug 25, 2020 · 793dfa7 · 793dfa7
2 parents 165c397 + 4aabda0
commit 793dfa7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/shortid/ShortId.cs b/shortid/ShortId.cs
@@ -77,8 +77,8 @@ public static string Generate(int length)
         /// </summary>
         /// <param name="options">The generation options.</param>
         /// <returns>A random string.</returns>
-        /// <exception cref="System.ArgumentNullException">Thrown when options is null.</exception>
-        /// <exception cref="System.ArgumentException">Thrown when options.Length is less than 8.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when options is null.</exception>
+        /// <exception cref="ArgumentException">Thrown when options.Length is less than 8.</exception>
         public static string Generate(GenerationOptions options)
         {
             if (options == null)
@@ -123,6 +123,7 @@ public static string Generate(GenerationOptions options)
         /// Changes the character set that id's are generated from.
         /// </summary>
         /// <param name="characters">The new character set.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="characters"/> is null or empty.</exception>
         /// <exception cref="InvalidOperationException">Thrown when the new character set is less than 20 characters.</exception>
         public static void SetCharacters(string characters)
         {