Master #4

Open
admdb wants to merge 10 commits from master into master
admdb commented 2018-11-09 12:54:54 +00:00 (Migrated from gitlab2.manjaro.org)
No description provided.
admdb commented 2018-11-12 17:18:09 +00:00 (Migrated from gitlab2.manjaro.org)

added 1 commit

  • 936c179e - [lxqt] edit globalkeyshortcuts.conf

Compare with previous version

added 1 commit <ul><li>936c179e - [lxqt] edit globalkeyshortcuts.conf</li></ul> [Compare with previous version](https://gitlab.manjaro.org/profiles-and-settings/manjaro-lxqt-settings/merge_requests/4/diffs?diff_id=1329&start_sha=34b2d0762aeb3331492faeb1b4f41172d8b18da7)
admdb commented 2018-11-12 17:19:46 +00:00 (Migrated from gitlab2.manjaro.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>f6ec4eaf - [lxqt] edit panel.conf</li></ul> [Compare with previous version](https://gitlab.manjaro.org/profiles-and-settings/manjaro-lxqt-settings/merge_requests/4/diffs?diff_id=1330&start_sha=936c179e9855a383af07b997407709eeb4968abf)
admdb commented 2018-11-25 12:31:47 +00:00 (Migrated from gitlab2.manjaro.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>eab52ef7 - [lxqt] edit panel.conf</li></ul> [Compare with previous version](https://gitlab.manjaro.org/profiles-and-settings/manjaro-lxqt-settings/merge_requests/4/diffs?diff_id=1378&start_sha=f6ec4eaf27323ba761bcdaea3471e95095cf7b15)
This pull request is broken due to missing fork information.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin master:master
git switch master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff master
git switch master
git rebase master
git switch master
git merge --ff-only master
git switch master
git rebase master
git switch master
git merge --no-ff master
git switch master
git merge --squash master
git switch master
git merge --ff-only master
git switch master
git merge master
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
profiles/manjaro-lxqt-settings!4
No description provided.