Skip to content

Commit

Permalink
remove extra lines (#1074)
Browse files Browse the repository at this point in the history
  • Loading branch information
PabloVD authored Apr 19, 2024
1 parent 7d119a5 commit 7204621
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions srunner/scenarioconfigs/osc2_scenario_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

from srunner.osc2_stdlib.path import Path

<<<<<<< HEAD
# pylint: disable=line-too-long
from srunner.scenarioconfigs.scenario_configuration import ScenarioConfiguration
=======
'''
Parses the osc2 scenario description file, generates type objects in the standard
library based on the type and keep constraint parameters, and sets parameters
>>>>>>> fd07c11... fix: removed empty files and translated Chinese to English
'''

# pylint: enable=line-too-long
from srunner.scenariomanager.carla_data_provider import CarlaDataProvider
Expand Down Expand Up @@ -163,10 +161,7 @@ def visit_parameter_declaration(self, node: ast_node.ParameterDeclaration):
vehicle_class = getattr(vehicles, para_type)
v_ins = vehicle_class()

<<<<<<< HEAD
# TODO: Analyzing and setting vehicle configuration parameters requires parsing the keep statement
=======
>>>>>>> fd07c11... fix: removed empty files and translated Chinese to English
v_ins.set_name(para_name)
if para_name == OSC2Helper.ego_name:
self.father_ins.add_ego_vehicles(v_ins)
Expand Down

0 comments on commit 7204621

Please sign in to comment.