fix build

This commit is contained in:
Guy Korland 2019-08-26 17:59:53 +03:00 committed by freestrings
parent 5a52ded4ca
commit fe376c4483

View File

@ -1027,15 +1027,7 @@ pub struct SelectorMut {
value: Option<Value>, value: Option<Value>,
} }
<<<<<<< HEAD fn replace_value<F: FnMut(Value) -> Option<Value>>(mut tokens: Vec<String>, value: &mut Value, fun: &mut F) {
<<<<<<< HEAD
fn replace_value<F: FnMut(Value) -> Value>(
mut tokens: Vec<String>,
value: &mut Value,
fun: &mut F,
) {
fn replace_value<F: FnMut(Value) -> Value>(mut tokens: Vec<String>, value: &mut Value, fun: &mut F) {
let mut target = value; let mut target = value;
let last_index = tokens.len() - 1; let last_index = tokens.len() - 1;