/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/walker/conflict.py

  • Committer: Tim Marston
  • Date: 2021-07-05 19:14:32 UTC
  • Revision ID: tim@ed.am-20210705191432-243ayb7s2nmussvi
python3ification

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict.py
20
20
 
21
21
 
22
22
import filecmp, os
23
 
from walker import Walker
 
23
from .walker import Walker
24
24
import stdhome.the as the
25
25
 
26
26