Commitba6e2c2

stevostean

committed

Resolving conflicts

2 parents3a72937 +58cd43e commitba6e2c2Copy full SHA for ba6e2c2

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ msgstr ""`
`282`	`282`	`#:../Doc/library/lzma.rst:154`
`283`	`283`	msgid":const:`FORMAT_RAW`: A raw data stream, not using any container format."
`284`	`284`	`msgstr""`
`285`		-":const:`FORMAT_RAW`: Un flux dedonnée brut, n'utilisant aucun format de "
	`285`	+":const:`FORMAT_RAW`: Un flux dedonnées brut, n'utilisant aucun format de "
`286`	`286`	`"conteneur."`
`287`	`287`
`288`	`288`	`#:../Doc/library/lzma.rst:151`

Comments

(0)