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

fix merge

This commit is contained in:
blagoev 2017-09-28 10:37:45 +03:00
parent fba3b3fc38
commit 6c5960ee7b
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/realm.js
View File

@ -93,11 +93,7 @@ class Realm {
constructor(config) {}
/**
<<<<<<< HEAD
* Open a realm asynchronously with a promise. If the realm is synced, it will be fully
=======
* Open a Realm asynchronously with a promise. If the Realm is synced, it will be fully
>>>>>>> 590f5845af4d8fd0bd82f280de4ec72cbcbba044
* synchronized before it is available.
* @param {Realm~Configuration} config
* @returns {ProgressPromise} - a promise that will be resolved with the realm instance when it's available.
@ -105,11 +101,7 @@ class Realm {
static open(config) {}
/**
<<<<<<< HEAD
* Open a realm asynchronously with a callback. If the realm is synced, it will be fully
=======
* Open a Realm asynchronously with a callback. If the Realm is synced, it will be fully
>>>>>>> 590f5845af4d8fd0bd82f280de4ec72cbcbba044
* synchronized before it is available.
* @param {Realm~Configuration} config
* @param {callback(error, realm)} - will be called when the realm is ready.