Merge remote-tracking branch 'Fran6co/imp-lat_lon'
Conflicts: DependencyInjection/Configuration.php
This commit is contained in:
commit
123da22ebd
|
@ -244,6 +244,7 @@ class Configuration
|
|||
->scalarNode('term_vector')->end()
|
||||
->scalarNode('null_value')->end()
|
||||
->booleanNode('include_in_all')->defaultValue('true')->end()
|
||||
->scalarNode('lat_lon')->end()
|
||||
->arrayNode('fields')
|
||||
->useAttributeAsKey('name')
|
||||
->prototype('array')
|
||||
|
@ -260,6 +261,7 @@ class Configuration
|
|||
->scalarNode('term_vector')->end()
|
||||
->scalarNode('null_value')->end()
|
||||
->booleanNode('include_in_all')->defaultValue('true')->end()
|
||||
->scalarNode('lat_lon')->end()
|
||||
->end()
|
||||
->end()
|
||||
->end()
|
||||
|
|
Loading…
Reference in a new issue