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/listings/en-CA/listing/title-txt | |
| 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/listings/en-CA/listing/title-txt')
| -rw-r--r-- | sample/src/main/play/listings/en-CA/listing/title-txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sample/src/main/play/listings/en-CA/listing/title-txt b/sample/src/main/play/listings/en-CA/listing/title-txt new file mode 100644 index 0000000..c3c5422 --- /dev/null +++ b/sample/src/main/play/listings/en-CA/listing/title-txt @@ -0,0 +1 @@ +KAU - Library Showcase
\ No newline at end of file |