X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7392b6e62e6d3c297b6d989db33c57482e216127..3d3046dc264792475c72987afc25beae23da4dc6:/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index 91cfbfde..e7bd5f2a 100644 --- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -1,4 +1,6 @@ /* ownCloud Android client application + * + * @author Bartek Przybylski * Copyright (C) 2012 Bartek Przybylski * Copyright (C) 2012-2013 ownCloud Inc. * @@ -33,9 +35,6 @@ import com.owncloud.android.utils.DisplayUtils; /** * Dialog which will be displayed to user upon keep-in-sync file conflict. - * - * @author Bartek Przybylski - * */ public class ConflictsResolveDialog extends SherlockDialogFragment {