fixing merge.

matlab-deep-learning · Nov 14, 2023 · a0f599b · a0f599b
1 parent 02ed712
commit a0f599b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/openAIChat.m b/openAIChat.m
@@ -99,10 +99,6 @@
                 nvp.ModelName                (1,1) {mustBeMember(nvp.ModelName,["gpt-4", "gpt-4-0613", "gpt-4-32k", ...
                                                         "gpt-3.5-turbo", "gpt-3.5-turbo-0613", "gpt-3.5-turbo-16k",... 
                                                         "gpt-3.5-turbo-16k-0613", "gpt-4-1106-preview"])} = "gpt-3.5-turbo"
-<<<<<<< HEAD
-
-=======
->>>>>>> bd6aa28 (New model and example)
                 nvp.Temperature                    {mustBeValidTemperature} = 1
                 nvp.TopProbabilityMass             {mustBeValidTopP} = 1
                 nvp.StopSequences                  {mustBeValidStop} = {}