Skip to content

Commit

Permalink
remove merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
MyreMylar authored Mar 10, 2024
1 parent 72413e8 commit 270e292
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pygame_gui/core/ui_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ def expand_top(self, height_increase: int) -> None:
This is achieved by setting the new dimensions and updating the anchors of all the elements anchored
to the top of the container.
:param height: The height to increase by. Pass in negative values to decrease the size
:param height_increase: The height to increase by. Pass in negative values to decrease the size
:return: None
"""
Expand Down Expand Up @@ -385,7 +384,6 @@ def hide(self):

self.visible = False


def on_contained_elements_changed(self, target: IUIElementInterface) -> None:
"""
Update the positioning of the contained elements of this container. To be called when one of the contained
Expand Down

0 comments on commit 270e292

Please sign in to comment.