remove line left over in conflict
This commit is contained in:
parent
8964dce609
commit
0b437ab6fd
1 changed files with 0 additions and 2 deletions
|
@ -156,8 +156,6 @@ const PostStatusForm = {
|
|||
const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
|
||||
const postLanguage = defaultPostLanguage || interfaceLanguage
|
||||
|
||||
const isoLanguage = interfaceToISOLanguage(interfaceLanguage)
|
||||
|
||||
let statusParams = {
|
||||
spoilerText: this.subject || '',
|
||||
status: statusText,
|
||||
|
|
Loading…
Reference in a new issue