mik-laj commented on a change in pull request #6295: [AIRFLOW-XXX] Adding Task 
re-run documentation
URL: https://github.com/apache/airflow/pull/6295#discussion_r332969061
 
 

 ##########
 File path: docs/scheduler.rst
 ##########
 @@ -15,9 +15,13 @@
     specific language governing permissions and limitations
     under the License.
 
+<<<<<<< HEAD
 
 
 Scheduling & Triggers
+=======
 
 Review comment:
   Somethings is broken here

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

Reply via email to