Commit7185585

committed

fix conflict problem

1 parent19d2787 commit7185585Copy full SHA for 7185585

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -959,13 +959,9 @@ msgstr ""`
`959`	`959`	"modules['spam.foo']``（就像上述引入後那樣），那麼後者必須作為前者的 ``foo`` "
`960`	`960`	`"屬性出現。"`
`961`	`961`
`962`		`-#:../../reference/import.rst:517`
`963`		`-msgid"Module spec"`
`964`		`-msgstr"模組規格"`
`965`		`-`
`966`	`962`	`#:../../reference/import.rst:519`
`967`	`963`	`msgid"Module specs"`
`968`		`-msgstr""`
	`964`	`+msgstr"模組規格"`
`969`	`965`
`970`	`966`	`#:../../reference/import.rst:521`
`971`	`967`	`msgid""`

Comments

(0)