Cleanups

harshad1 · Apr 5, 2024 · 33ee3b9 · 33ee3b9
1 parent 1eb8b14
commit 33ee3b9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java b/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java
@@ -12,7 +12,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Build;
 import android.text.Editable;
 import android.view.View;
 import android.widget.Button;
@@ -27,7 +26,6 @@
 import net.gsantner.markor.R;
 import net.gsantner.markor.format.FormatRegistry;
 import net.gsantner.markor.format.markdown.MarkdownSyntaxHighlighter;
-import net.gsantner.markor.format.todotxt.TodoTxtTask;
 import net.gsantner.markor.frontend.filebrowser.MarkorFileBrowserFactory;
 import net.gsantner.markor.frontend.filesearch.FileSearchDialog;
 import net.gsantner.markor.frontend.filesearch.FileSearchEngine;

diff --git a/app/src/main/java/net/gsantner/markor/frontend/filesearch/FileSearchDialog.java b/app/src/main/java/net/gsantner/markor/frontend/filesearch/FileSearchDialog.java
@@ -22,7 +22,6 @@
 import net.gsantner.markor.ApplicationObject;
 import net.gsantner.markor.R;
 import net.gsantner.markor.model.AppSettings;
-import net.gsantner.opoc.format.GsTextUtils;
 import net.gsantner.opoc.util.GsContextUtils;
 import net.gsantner.opoc.wrapper.GsCallback;
 

diff --git a/...src/main/java/net/gsantner/markor/frontend/filesearch/FileSearchResultSelectorDialog.java b/...src/main/java/net/gsantner/markor/frontend/filesearch/FileSearchResultSelectorDialog.java
@@ -38,21 +38,12 @@ public class FileSearchResultSelectorDialog {
     /**
      * Show a file system selector dialog
      *
-<<<<<<< HEAD
-     * @param activity      Activity to use
-     * @param searchResults Search results to filter
-     * @param callback      Callback to call when a item is selected
-     *                      callback.first:  Path to file (relative)
-     *                      callback.second: Line number (null if not applicable)
-     *                      callback.third:  True if the dialog was dismissed by long clicking on a file
-=======
      * @param activity       Activity to use
      * @param searchResults  Search results to filter
      * @param callback       Callback to call when a item is selected
      *                       callback.first:  Path to file (relative)
      *                       callback.second: Line number (null if not applicable)
      *                       callback.third:  True if the dialog was dismissed by long clicking on a file
->>>>>>> shortcut_to_special_file_old
      */
     public static void showDialog(
             final Activity activity,