status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge conflict

This commit is contained in:
Kenneth Geisshirt 2017-09-08 14:57:49 +02:00
parent 356033a8c4
commit c7461b1872
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,11 +1,7 @@
{
"name": "realm",
"description": "Realm is a mobile database: an alternative to SQLite and key-value stores",
<<<<<<< HEAD
"version": "2.0.0-rc5",
=======
"version": "1.11.1",
>>>>>>> 38bceddfb19fd9f8ac5cc62ddb8bfa626270aa5c
"license": "Apache-2.0",
"homepage": "https://realm.io",
"keywords": [