comentado session.hendler.pdo

Bruno Menezes
1 parent 3b229ed6
Showing 1 changed file with 0 additions and 4 deletions Show diff stats
app/config/config.yml
@@ -16,11 +16,7 @@ framework:
     default_locale:  "%locale%"
 #    trusted_proxies: ~
     session: ~
-<<<<<<< HEAD
 #    session:
-=======
-#    session:         
->>>>>>> 3231c12b96a54895b98ca370973d04235b4c924d
 #        handler_id: session.handler.pdo
  
 parameters:
...	...	@@ -16,11 +16,7 @@ framework:
16	16	default_locale: "%locale%"
17	17	# trusted_proxies: ~
18	18	session: ~
19		-<<<<<<< HEAD
20	19	# session:
21		-=======
22		-# session:
23		->>>>>>> 3231c12b96a54895b98ca370973d04235b4c924d
24	20	# handler_id: session.handler.pdo
25	21
26	22	parameters:
...	...