search

mate-desktop / mate-applets

Applets for use with the MATE panel
http://www.mate-desktop.org
GNU General Public License v2.0
79 stars 67 forks source link

Fix display of IP in tooltip if no IPv4 is configured #573

Closed treysis closed 3 years ago

rbuj commented 3 years ago

There is an additional commit in this PR, which has already been merged.

treysis commented 3 years ago

There is an additional commit in this PR, which has already been merged.

Uh. How do I resolve that? Should I rebase and then commit again?

rbuj commented 3 years ago

Uh. How do I resolve that? Should I rebase and then commit again?

First, you can squash the last commit on your local copy using git rebase -i HEAD~2, then you can work with a single commit.

rbuj commented 3 years ago

You can use git commit --amend for updating your last commit.

rbuj commented 3 years ago

merged on #575