Merge pull request #166 from Kinto/pullChanges-code-comment

Correct code comment for `Collection#pullChanges`
Kinto · Sep 19, 2015 · f0f81d9 · f0f81d9
2 parents ee06f16 + 0754b73
commit f0f81d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/collection.js b/src/collection.js
@@ -443,8 +443,8 @@ export default class Collection {
   }
 
   /**
-   * Import remote changes to the local database. Will reject on encountered
-   * conflicts.
+   * Fetch remote changes, import them to the local database,
+   * and (according to `options.strategy`) handle conflicts.
    *
    * @param  {SyncResultObject} syncResultObject
    * @param  {Object}           options