Commit8727c86

oleksandr.volha

committed

resolve conflicts

2 parents7e8169e +428f231 commit8727c86Copy full SHA for 8727c86

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,7 @@ def _wrap_str_value(value: str) -> str:`
`73`	`73`	`defequal_modifier(self,field:str,value:DEFAULT_VALUE_TYPE)->str:`
`74`	`74`	`ifisinstance(value,list):`
`75`	`75`	`values=", ".join(`
`76`		`-f"{self._pre_process_value(field,str(v)ifisinstance(v,int)elsev,ValueType.value,True)}"`
`77`		`-forvinvalue`
	`76`	`+f"{self._pre_process_value(field,str(v),value_type=ValueType.value,wrap_str=True)}"forvinvalue`
`78`	`77`	`)`
`79`	`78`	`returnf"{field} in ({values})"`
`80`	`79`

Comments

(0)