Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

pamac
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

Admin message

Due to an influx of spam, we had to disable account registrations. If you don't have an account yet, please write an email to support@manjaro.org, with your desired username. Sorry for the inconvenience.

This is an archived project. Repository and other project resources are read-only.

5ecbbbd9

Commit 5ecbbbd9 authored 12 years ago by guinux

Downloads
- Patches
- Plain Diff

fix handling conflicts (I hope)

parent 41d81d5d

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

backend/__init__.py 0 additions, 0 deletions

backend/__init__.py
backend/config.py 0 additions, 0 deletions

backend/config.py
backend/transaction.py 16 additions, 36 deletions

backend/transaction.py
backend/tray.py 51 additions, 0 deletions

backend/tray.py
backend/update.py 60 additions, 0 deletions

backend/update.py
gui/dialogs.glade 1 addition, 0 deletions

gui/dialogs.glade
pamac 73 additions, 32 deletions

pamac
pamac-update 7 additions, 51 deletions

pamac-update

with 208 additions and 119 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment