W3C home > Mailing lists > Public > public-device-apis-log@w3.org > July 2018

Re: [wake-lock] Restrict status reporting for wake lock

From: Marcos Cáceres via GitHub <sysbot+gh@w3.org>
Date: Tue, 10 Jul 2018 11:58:09 +0000
To: public-device-apis-log@w3.org
Message-ID: <issue_comment.created-403796855-1531223888-sysbot+gh@w3.org>
Looking at the conflicts, they seem to be legit, and not tidy related. There is only two. The first seems to be fine to take from HEAD. But I was unsure about the second:

<<<<<<< HEAD
        <li data-tests="wakelock-type.https.html">If <a>WakeLock</a> object's
        <a data-lt="WakeLock.type">type</a> attribute is not equal to
        <var>type</var>, abort these steps.
        <li data-tests="wakelock-onactivechange.https.html">
          <a>Queue a task</a> which updates the <a>WakeLock</a> object's
          <code>active</code> attribute and <a data-lt="fire an event">fires an
          event</a> named <code>activechange</code> at the <a>WakeLock</a>
>>>>>>> Restrict status reporting for wake lock

Did you remove that text on purpose or is it intended to stay? 

GitHub Notification of comment by marcoscaceres
Please view or discuss this issue at https://github.com/w3c/wake-lock/pull/125#issuecomment-403796855 using your GitHub account
Received on Tuesday, 10 July 2018 11:58:15 UTC

This archive was generated by hypermail 2.4.0 : Monday, 4 July 2022 12:47:55 UTC