Skip to content

Commit cedec7a

Browse files
committed
sync with master & resolve conflicts.
2 parents 9a04b5a + 732b247 commit cedec7a

File tree

3 files changed

+72
-172
lines changed

3 files changed

+72
-172
lines changed

DelveClientSDK/Connection.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,12 @@ public ICollection<AbstractProblem> CollectProblems()
374374
public bool Configure(
375375
bool? debug = null,
376376
bool? debugTrace = null,
377-
bool? broken = null,
378377
bool? silent = null,
379378
bool? abortOnError = null
380379
)
381380
{
382381
SetConnectionOnClients();
383-
return Client.Configure(debug, debugTrace, broken, silent, abortOnError);
382+
return Client.Configure(debug, debugTrace, silent, abortOnError);
384383
}
385384

386385
public bool Status()

DelveClientSDK/DelveClient.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -948,15 +948,13 @@ public ICollection<AbstractProblem> CollectProblems()
948948
public bool Configure(
949949
bool? debug = null,
950950
bool? debugTrace = null,
951-
bool? broken = null,
952951
bool? silent = null,
953952
bool? abortOnError = null
954953
)
955954
{
956955
var action = new SetOptionsAction();
957956
action.Debug = debug;
958957
action.Debug_trace = debugTrace;
959-
action.Broken = broken;
960958
action.Silent = silent;
961959
action.Abort_on_error = abortOnError;
962960
return RunAction(action, isReadOnly: false) != null;

0 commit comments

Comments
 (0)