From 937235af6c6a61e754b1b4b641c1240dc5ffae8d Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 15 May 2015 11:37:34 +0200 Subject: [PATCH] fixed merge --- python/sciebo_shares.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/python/sciebo_shares.py b/python/sciebo_shares.py index 60edac3..868317d 100755 --- a/python/sciebo_shares.py +++ b/python/sciebo_shares.py @@ -199,8 +199,7 @@ if __name__ == "__main__": command = args[0] else: command = 'list' - -<<<<<<< HEAD + if command == 'add': add_shares(options, oc, shares) elif command == 'list': @@ -210,12 +209,3 @@ if __name__ == "__main__": except owncloud.ResponseError as e: print 'OwnCloud: %s' % e.response.content.strip() -======= - if command == 'add': - add_shares(oc, shares) - elif command == 'list': - admin = (len(sys.argv) == 3) and (sys.argv[2] == 'admin') - list_shares(oc, shares, admin) - elif command == 'check': - check_shares(oc, shares) ->>>>>>> c849a33e2d76a4349136ab874b977599786789e2