Add sphinx for karst_layer

Sophie Gachet sophie.gachet@swisstopo.ch · loicgasser · commit 77d5fc7cad33 · 2016-12-13T09:14:57.000+01:00
diff --git a/conf/bafu.conf.part b/conf/bafu.conf.part
@@ -713,7 +713,6 @@ source src_ch_bafu_karst-einzugsgebietseinheiten : def_searchable_features
             , box2d(the_geom) as geom_st_box2d \
             , objectid::text as feature_id \
         from hydrologie.karst_einzugsgebieteinheiten
->>>>>>> Add sphinx config for karst
 }
 
 source src_ch_bafu_karst-ausdehnung_grundwasservorkommen : def_searchable_features

Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,6 @@ source src_ch_bafu_karst-einzugsgebietseinheiten : def_searchable_features`
`713`	`713`	`, box2d(the_geom) as geom_st_box2d \`
`714`	`714`	`, objectid::text as feature_id \`
`715`	`715`	`from hydrologie.karst_einzugsgebieteinheiten`
`716`		`->>>>>>> Add sphinx config for karst`
`717`	`716`	`}`
`718`	`717`
`719`	`718`	`source src_ch_bafu_karst-ausdehnung_grundwasservorkommen : def_searchable_features`