diff options
| author | Allan Wang <allanwang@google.com> | 2019-07-27 17:46:04 -0700 |
|---|---|---|
| committer | Allan Wang <allanwang@google.com> | 2019-07-27 17:46:04 -0700 |
| commit | 50c8012e2fe88d6b275d1a3269033590962caa7f (patch) | |
| tree | 65ebb32525be83441e6caac8362e3e9ae022bfd1 /sample/src/main/play | |
| parent | 01058912580a3ecfe77eaf6af209e1c46a97f2d7 (diff) | |
| parent | d94017e6f6df67e80604111028ea16f6c7f4e077 (diff) | |
| download | kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.gz kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.bz2 kau-50c8012e2fe88d6b275d1a3269033590962caa7f.zip | |
Fix initial conflicts
Diffstat (limited to 'sample/src/main/play')
| -rw-r--r-- | sample/src/main/play/contact-email.txt (renamed from sample/src/main/play/contactEmail) | 0 | ||||
| -rw-r--r-- | sample/src/main/play/default-language.txt (renamed from sample/src/main/play/defaultLanguage) | 0 | ||||
| -rw-r--r-- | sample/src/main/play/listings/en-CA/listing/full-description.txt (renamed from sample/src/main/play/en-CA/listing/fulldescription) | 0 | ||||
| -rw-r--r-- | sample/src/main/play/listings/en-CA/listing/short-description.txt (renamed from sample/src/main/play/en-CA/listing/shortdescription) | 0 | ||||
| -rw-r--r-- | sample/src/main/play/listings/en-CA/listing/title-txt (renamed from sample/src/main/play/en-CA/listing/title) | 0 | ||||
| -rw-r--r-- | sample/src/main/play/release-notes/en-CA/default.txt (renamed from sample/src/main/play/en-CA/whatsnew) | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/sample/src/main/play/contactEmail b/sample/src/main/play/contact-email.txt index 3e03392..3e03392 100644 --- a/sample/src/main/play/contactEmail +++ b/sample/src/main/play/contact-email.txt diff --git a/sample/src/main/play/defaultLanguage b/sample/src/main/play/default-language.txt index ffdd217..ffdd217 100644 --- a/sample/src/main/play/defaultLanguage +++ b/sample/src/main/play/default-language.txt diff --git a/sample/src/main/play/en-CA/listing/fulldescription b/sample/src/main/play/listings/en-CA/listing/full-description.txt index 2d9fe89..2d9fe89 100644 --- a/sample/src/main/play/en-CA/listing/fulldescription +++ b/sample/src/main/play/listings/en-CA/listing/full-description.txt diff --git a/sample/src/main/play/en-CA/listing/shortdescription b/sample/src/main/play/listings/en-CA/listing/short-description.txt index 9424ee8..9424ee8 100644 --- a/sample/src/main/play/en-CA/listing/shortdescription +++ b/sample/src/main/play/listings/en-CA/listing/short-description.txt diff --git a/sample/src/main/play/en-CA/listing/title b/sample/src/main/play/listings/en-CA/listing/title-txt index c3c5422..c3c5422 100644 --- a/sample/src/main/play/en-CA/listing/title +++ b/sample/src/main/play/listings/en-CA/listing/title-txt diff --git a/sample/src/main/play/en-CA/whatsnew b/sample/src/main/play/release-notes/en-CA/default.txt index 1d15ce2..1d15ce2 100644 --- a/sample/src/main/play/en-CA/whatsnew +++ b/sample/src/main/play/release-notes/en-CA/default.txt |