mirror of
https://github.com/status-im/realm-js.git
synced 2025-02-04 10:43:29 +00:00
merge conflict
This commit is contained in:
parent
356033a8c4
commit
c7461b1872
@ -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": [
|
||||
|
Loading…
x
Reference in New Issue
Block a user