Skip to content

Commit

Permalink
Fix merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
calixtus committed May 27, 2024
1 parent 55a1345 commit 9aa8cc4
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
import javafx.scene.layout.HBox;

import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
import org.jabref.gui.keyboard.KeyBindingRepository;
import org.jabref.gui.util.ViewModelListCellFactory;
import org.jabref.model.entry.BibEntry;

import com.airhacks.afterburner.views.ViewLoader;
import jakarta.inject.Inject;

/**
* Field editor that provides various pre-defined options as a drop-down combobox.
Expand Down

0 comments on commit 9aa8cc4

Please sign in to comment.