GIT: Merge conflicted branches

Gui-FernandesBR · Gui-FernandesBR · commit 352073e91669 · 2022-09-11T21:27:15.000+02:00
diff --git a/rocketpy/Environment.py b/rocketpy/Environment.py
@@ -1879,6 +1879,7 @@ def processForecastReanalysis(self, file, dictionary):
                 )
             )
 
+
         # Get pressure level data from file
         try:
             levels = (

Original file line number	Diff line number	Diff line change
`@@ -1879,6 +1879,7 @@ def processForecastReanalysis(self, file, dictionary):`
`1879`	`1879`	`)`
`1880`	`1880`	`)`
`1881`	`1881`
	`1882`	`+`
`1882`	`1883`	`# Get pressure level data from file`
`1883`	`1884`	`try:`
`1884`	`1885`	`levels = (`