# Conflicts:
#	src/main/java/net/sf/jabref/Globals.java
#	src/main/java/net/sf/jabref/JabRef.java
#	src/main/java/net/sf/jabref/exporter/SaveDatabaseAction.java
#	src/main/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
#	src/main/java/net/sf/jabref/external/MoveFileAction.java
#	src/main/java/net/sf/jabref/gui/BasePanel.java
#	src/main/java/net/sf/jabref/gui/FileDialogs.java
#	src/main/java/net/sf/jabref/gui/FileListEntryEditor.java
#	src/main/java/net/sf/jabref/gui/actions/BrowseAction.java
#	src/main/java/net/sf/jabref/gui/journals/ManageJournalsPanel.java
#	src/main/java/net/sf/jabref/gui/plaintextimport/TextInputDialog.java
#	src/main/java/net/sf/jabref/importer/ImportFormatReader.java
#	src/main/java/net/sf/jabref/importer/OpenDatabaseAction.java
#	src/main/java/net/sf/jabref/importer/fetcher/DOItoBibTeXFetcher.java
#	src/main/java/net/sf/jabref/importer/fetcher/MedlineFetcher.java
#	src/main/java/net/sf/jabref/importer/fileformat/BiblioscapeImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/FreeCiteImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/InspecImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/IsiImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/MedlineImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/MedlinePlainImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/MsBibImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/OvidImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/PdfContentImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/PdfXmpImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/RepecNepImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/RisImporter.java
#	src/main/java/net/sf/jabref/importer/fileformat/SilverPlatterImporter.java
#	src/main/java/net/sf/jabref/logic/msbib/MSBibDatabase.java
#	src/main/java/net/sf/jabref/logic/xmp/XMPUtil.java
#	src/main/java/net/sf/jabref/pdfimport/PdfImporter.java
#	src/test/java/net/sf/jabref/exporter/BibDatabaseWriterTest.java
#	src/test/java/net/sf/jabref/importer/ImportFormatReaderIntegrationTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/BiblioscapeImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/BiblioscapeImporterTestFiles.java
#	src/test/java/net/sf/jabref/importer/fileformat/BiblioscapeImporterTestTypes.java
#	src/test/java/net/sf/jabref/importer/fileformat/CopacImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/EndnoteImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/InspecImportTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/IsiImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/MedlinePlainImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/MsBibImporterTestfiles.java
#	src/test/java/net/sf/jabref/importer/fileformat/OvidImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/PdfContentImporterTestFiles.java
#	src/test/java/net/sf/jabref/importer/fileformat/PdfXmpImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/RISImporterTestFiles.java
#	src/test/java/net/sf/jabref/importer/fileformat/RepecNepImporterTest.java
#	src/test/java/net/sf/jabref/importer/fileformat/SilverPlatterImporterTest.java
#	src/test/java/net/sf/jabref/logic/openoffice/OOBibStyleTest.java