add license

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 WinTenDev, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

readme.md

@@ -11,6 +11,7 @@
       alt="Contributions welcome" />
   </a>
  <!-- issues -->
+<<<<<<< HEAD
   <a href="https://github.com/WinTenDev/oTab-WebExtension/issues">
     <img src="https://img.shields.io/github/issues/WinTenDev/oTab-WebExtension.svg"
       alt="Issues" />
@@ -28,6 +29,25 @@
  <!-- License --> 
   <a href="https://github.com/WinTenDev/oTab-WebExtension/blob/master/LICENSE">
     <img src="https://img.shields.io/github/license/WinTenDev/oTab-WebExtension.svg"
+=======
+  <a href="https://github.com/WinTenDev/oTab-BrowserExtension/issues">
+    <img src="https://img.shields.io/github/issues/WinTenDev/oTab-BrowserExtension.svg"
+      alt="Issues" />
+  </a>
+  <!-- Forks Status -->
+  <a href="https://github.com/WinTenDev/oTab-BrowserExtension/network/members">
+    <img src="https://img.shields.io/github/forks/WinTenDev/oTab-BrowserExtension.svg"
+      alt="Forks Status" />
+  </a>
+  <!-- Stars Status -->
+  <a href="https://github.com/WinTenDev/oTab-BrowserExtension/stargazers">
+    <img src="https://img.shields.io/github/stars/WinTenDev/oTab-BrowserExtension.svg"
+      alt="Stars Status" />
+  </a>
+ <!-- License --> 
+  <a href="https://github.com/WinTenDev/oTab-BrowserExtension/blob/master/LICENSE">
+    <img src="https://img.shields.io/github/license/WinTenDev/oTab-BrowserExtension.svg"
+>>>>>>> de79d27aa0daffdd9159eec7c2db8f782cd4861a
       alt="License MIT" />
   </a>
   <!-- Telegram -->
@@ -37,40 +57,68 @@
   </a>
 </p>
 
+<<<<<<< HEAD
 By using this extension, you can easily organize your browser tab.
 
 You only need to drag and drop your browser tab into your collections that you have created and use tags to organize it.
 And with oTab extension, you can easily create and manage your notes and tasks in one place.
+=======
+Cara yang lebih baik untuk mengatur browser Anda dan mengelola catatan dan tugas Anda di satu tempat.
+
+Dengan menggunakan ekstensi ini, Anda dapat dengan mudah mengatur tab browser Anda.
+Anda hanya perlu menarik dan melepas tab peramban ke dalam koleksi yang telah Anda buat dan menggunakan tag untuk mengaturnya.
+
+> > > > > > > de79d27aa0daffdd9159eec7c2db8f782cd4861a
 
 # Contribute
+
 ## Getting started
+
 type `yarn install` to install all dependencies
 
 ## Development
+
 type `yarn watch:dev` to build extension into `dist` for development
 
 ## Build Production
+
 type `yarn build` to build the extension into `dist` folder for production.
 
 ## Build zip
+
 type `yarn build-zip` to build zip file from `dist` folder
 
 # Install to Browser
+
 - [x] [Mozilla Firefox (Quantum)](https://addons.mozilla.org/en-US/firefox/addon/otab-extension/)
 - [ ] Microsoft Edge
 - [ ] Google Chrome
 - [ ] Safari Browser
 
-
 ## Bug Report
 
+<<<<<<< HEAD
 If you find a bug, kindly open an issue [here](https://github.com/WinTenDev/oTab-WebExtension/issues/new).
 
 ## Feature Request
 
-Feature requests are always welcome. If you'd like to request a new function, feel free to do so by opening an issue [here](https://github.com/WinTenDev/oTab-WebExtension/issues/new). Please include sample queries and their corresponding results.
+# Feature requests are always welcome. If you'd like to request a new function, feel free to do so by opening an issue [here](https://github.com/WinTenDev/oTab-WebExtension/issues/new). Please include sample queries and their corresponding results.
+
+If you find a bug, kindly open an issue [here](https://github.com/WinTenDev/oTab-BrowserExtension/issues/new).
+
+## Feature Request
+
+Feature requests are always welcome. If you'd like to request a new function, feel free to do so by opening an issue [here](https://github.com/WinTenDev/oTab-BrowserExtension/issues/new). Please include sample queries and their corresponding results.
+
+> > > > > > > de79d27aa0daffdd9159eec7c2db8f782cd4861a
 
 ## License
+
 The MIT License (MIT)
 
-Copyright © 2019 [@WinTenDev](https://t.me/WinTenDev)
+<<<<<<< HEAD
+Copyright © 2019 [@WinTenDev](https://t.me/WinTenDev)
+=======
+Copyright © 2019 [@WinTenDev](https://t.me/WinTenDev)
+
+> > > > > > > de79d27aa0daffdd9159eec7c2db8f782cd4861a