search

python-sdbus / python-sdbus-networkmanager

python-sdbus binds for NetworkManager
GNU Lesser General Public License v2.1
28 stars 6 forks source link

For merge of #14: revert changes to add-wifi-psk-connection #29

Closed bernhardkaindl closed 2 years ago

bernhardkaindl commented 2 years ago

14 has conflicting changes for the add-wifi-psk-connection examples (async and blocking).

As an alternative to #28 (which has the conflicts resolved and everything fully updated) this allows to merge #14 itself.

It reverts the changes for the add-wifi-psk-connection examples (async and blocking) in master since #14 was branched.

After #14 is merged, the version of add-wifi-psk-connection from #28 can be merged (which are further improved), or #28 does it all in one merge.

bernhardkaindl commented 2 years ago

@igo95862 With this merged into master, you avoid the conflicts and you can merge #14 to master then. Alternatively, use #28.