← Back to branch summary

~mpontillo/maas/list-connected-macs-2.0

~mpontillo/maas/list-connected-macs-2.0

Viewing all changes in revision 5067.

Committer: MAAS Lander
Author(s): Gavin Panella
Date: 2016-06-03 15:38:22 UTC
mfrom: (5065.1.1 remove-detritus-2016-06-03)
Revision ID: maas_lander-20160603153822-nns8z70pqikni1as

[r=allenap][bug=][author=allenap] Remove erroneously committed merge conflicts.

files removed:
src/provisioningserver/drivers/service.moved

src/provisioningserver/twisted.moved

src/provisioningserver/twisted.moved/conch

src/provisioningserver/twisted.moved/conch/ssh

src/provisioningserver/twisted.moved/protocols

src/provisioningserver/twisted.moved/web

Show diffs side-by-side

added added

removed removed

src/provisioningserver/drivers/service.moved/

src/provisioningserver/twisted.moved/

src/provisioningserver/twisted.moved/conch/

src/provisioningserver/twisted.moved/conch/ssh/

src/provisioningserver/twisted.moved/protocols/

src/provisioningserver/twisted.moved/web/

Older »