mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2026-11-04 22:09:24 +00:00
fix merge conflict
This commit is contained in:
1 parent
9eee37bc68
commit
97bbca3aef
2 files changed
-2
No files matched your search
@@ -2,7 +2,6 @@ import { DatePipe } from '@angular/common'
|
||||
import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core'
|
||||
import { SETTINGS_KEYS } from '../data/paperless-uisettings'
|
||||
import { SettingsService } from '../services/settings.service'
|
||||
import { normalizeDateStr } from '../utils/date'
|
||||
|
||||
const FORMAT_TO_ISO_FORMAT = {
|
||||
longDate: 'y-MM-dd',
|
||||
|
||||
Reference in new issue
Block a user