Merge issue

This commit is contained in:
Jamie Mac 2024-03-20 07:36:08 +00:00
parent 112960924b
commit e0882761f2
3 changed files with 5 additions and 1 deletions

View File

@ -8,6 +8,7 @@
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>

3
.gitignore vendored
View File

@ -103,3 +103,6 @@ settings.xml
.settings/org.eclipse.core.resources.prefs .settings/org.eclipse.core.resources.prefs
.classpath .classpath
.classpath .classpath
.project
.classpath
.classpath

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>PamGuard Main Tethys</name> <name>PAMGuard</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>