fixed certain errors
@@ -1480,20 +1480,9 @@ def move_items(lib, dest, query, copy, album, pretend, export=False, confirm=Fal
for obj in objs])
else:
if export:
-<<<<<<< HEAD
for obj in objs:
util.copy(obj.path, obj.destination(basedir=dest))
if confirm:
-=======
->>>>>>> 53618258faec970a0005b640d6811ad0aa04684a
- objs = ui.input_select_objects(
- u'Really %s' % act, objs,
- lambda o: show_path_changes(
- [(o.path, o.destination(basedir=dest))]))
- for obj in objs:
- util.copy(obj.path, obj.destination(basedir=dest))
- else:
- if confirm:
objs = ui.input_select_objects(
u'Really %s' % act, objs,
lambda o: show_path_changes(
