Commitee6069e

committed

Merge branch '6.2' into 6.3

* 6.2: [FrameworkBundle] Fix merging typos

2 parents6c98343 +ef2bdaf commitee6069eCopy full SHA for ee6069e

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-nsl.. _framework-bundle-configuration:`
	`1`	`+.. _framework-bundle-configuration:`
`2`	`2`
`3`	`3`	`Framework Configuration Reference (FrameworkBundle)`
`4`	`4`	`===================================================`
`@@ -25,7 +25,7 @@ Configuration`
`25`	`25`	`-------------`
`26`	`26`
`27`	`27`	`.. _configuration-framework-secret:`
`28`		`-a`
	`28`	`+`
`29`	`29`	`secret`
`30`	`30`	`~~~~~~`
`31`	`31`

Comments

(0)