gistfile1.txt

===================================================================
--- src/util/async_queue.ts	(date 1521229072000)
+++ src/util/async_queue.ts	(date 1521229072000)
@@ -31,13 +31,6 @@
  * The string values are used when encoding these timer IDs in JSON spec tests.
  */
 export enum TimerId {
-<<<<<<< HEAD
-  ListenStreamIdle,
-  ListenStreamConnection,
-  WriteStreamIdle,
-  WriteStreamConnection,
-  ClientMetadataRefresh
-=======
   /** All can be used with runDelayedOperationsEarly() to run all timers. */
   All = 'all',
 
@@ -57,8 +50,13 @@
    * OnlineState.Unknown to Offline after a set timeout, rather than waiting
    * indefinitely for success or failure.
    */
-  OnlineStateTimeout = 'online_state_timeout'
->>>>>>> master
+  OnlineStateTimeout = 'online_state_timeout',
+
+  /**
+   * A timer used to update the client metadata in IndexedDb, which is used
+   * to determine the primary leaseholder.
+   */
+  ClientMetadataRefresh = 'client_metadata_refresh'
 }
 
 /**