resolve conflicts

Lightning-AI · Nov 21, 2022 · 2ac7060 · 2ac7060
1 parent eac6c3f
commit 2ac7060
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/lightning_app/CHANGELOG.md b/src/lightning_app/CHANGELOG.md
@@ -8,20 +8,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
-- 
+-
 
 
 ### Changed
 
-- 
+-
 
 
 ### Fixed
 
 - 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
@@ -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
@@ -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
@@ -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