Skip to content

Commit

Permalink
fixed typo
Browse files Browse the repository at this point in the history
  • Loading branch information
Atillart-One committed Jun 23, 2022
1 parent 3fdaeae commit 60981cb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ def update():
repo.git.merge('-Xtheirs', '--allow-unrelated-histories', '--no=commit', 'origin/master')
except Exception:
repo.git.merge('--autostash', '--allow-unrelated-histories', '--no-commit', 'origin/master')
repo.git.reset('$(git diff --name-only')
repo.git.restore('$(git diff --name-only')
repo.git.reset('$(git diff --name-only)')
repo.git.restore('$(git diff --name-only)')
repo.git.stash('drop')
canvas.itemconfig(progress, text="")
canvas.itemconfig('progress', state='hidden')
Expand Down

0 comments on commit 60981cb

Please sign in to comment.