From 2ac70609705c5a09af5cff5c1b6f17acfefb5633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20W=C3=A4lchli?= Date: Mon, 21 Nov 2022 12:19:47 +0100 Subject: [PATCH] resolve conflicts --- src/lightning_app/CHANGELOG.md | 6 +++--- src/lightning_lite/CHANGELOG.md | 6 +++--- .../strategies/launchers/subprocess_script.py | 1 + src/pytorch_lightning/CHANGELOG.md | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lightning_app/CHANGELOG.md b/src/lightning_app/CHANGELOG.md index f1a975c2bb93f..2bf7043dcce7d 100644 --- a/src/lightning_app/CHANGELOG.md +++ b/src/lightning_app/CHANGELOG.md @@ -8,12 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Added -- +- ### Changed -- +- ### Fixed @@ -21,7 +21,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Fixed debugging with VSCode IDE ([#15747](https://github.com/Lightning-AI/lightning/pull/15747)) -- +- ## [1.8.2] - 2022-11-17 diff --git a/src/lightning_lite/CHANGELOG.md b/src/lightning_lite/CHANGELOG.md index 63802002395a5..515bd44ce2415 100644 --- a/src/lightning_lite/CHANGELOG.md +++ b/src/lightning_lite/CHANGELOG.md @@ -8,17 +8,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Added -- +- ### Changed -- +- ### Fixed -- +- ## [1.8.2] - 2022-11-17 diff --git a/src/lightning_lite/strategies/launchers/subprocess_script.py b/src/lightning_lite/strategies/launchers/subprocess_script.py index c9649f4639818..1fb8b9686bb41 100644 --- a/src/lightning_lite/strategies/launchers/subprocess_script.py +++ b/src/lightning_lite/strategies/launchers/subprocess_script.py @@ -14,6 +14,7 @@ import os import subprocess import sys +from time import sleep from typing import Any, Callable, Optional, Sequence, Tuple import numpy as np diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index b22ee5c8f994c..088454ba873a5 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Added -- +- ### Changed @@ -21,7 +21,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Fixed -- +- ## [1.8.2] - 2022-11-17