Add author's line in license

[pub/Android/ownCloud.git] / 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 91cfbfd..e7bd5f2 100644 (file)
--- 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
 /* ownCloud Android client application

+ *
+ *   @author Bartek Przybylski

  *   Copyright (C) 2012 Bartek Przybylski
  *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   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.
 
 /**
  * Dialog which will be displayed to user upon keep-in-sync file conflict.

- * 
- * @author Bartek Przybylski
- *

  */
 public class ConflictsResolveDialog extends SherlockDialogFragment {
 
  */
 public class ConflictsResolveDialog extends SherlockDialogFragment {