Skip to content

Commit a0f599b

Browse files
committed
fixing merge.
1 parent 02ed712 commit a0f599b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

openAIChat.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@
9999
nvp.ModelName (1,1) {mustBeMember(nvp.ModelName,["gpt-4", "gpt-4-0613", "gpt-4-32k", ...
100100
"gpt-3.5-turbo", "gpt-3.5-turbo-0613", "gpt-3.5-turbo-16k",...
101101
"gpt-3.5-turbo-16k-0613", "gpt-4-1106-preview"])} = "gpt-3.5-turbo"
102-
<<<<<<< HEAD
103-
104-
=======
105-
>>>>>>> bd6aa28 (New model and example)
106102
nvp.Temperature {mustBeValidTemperature} = 1
107103
nvp.TopProbabilityMass {mustBeValidTopP} = 1
108104
nvp.StopSequences {mustBeValidStop} = {}

0 commit comments

Comments
 (0)