resolve merge conflict

2018-10-08 10:37:02 +10:00
parent fe1a078452 17a88bee90
commit 00437060fd
1 changed files with 3 additions and 3 deletions
@@ -1,7 +1,7 @@
 ---
 layout: default
-title: Tiny Drive
-title_nav: Tiny Drive
+title: Drive
+title_nav: Drive
 description_short: Tiny Drive
 description: Tiny Drive. A premium plugin to manage files & images.
 keywords: tinydrive storage media tiny drive
@@ -69,4 +69,4 @@ tinymce.init({
  tinydrive_token_provider: 'URL_TO_YOUR_TOKEN_PROVIDER',
  toolbar: 'insertfile image link | code'
 });
-```
+```