conflict fixes

This commit is contained in:
Adil El Farissi
2024-07-06 21:25:39 +00:00
parent 4ece46b7a3
commit 6907ced898
3 changed files with 2 additions and 3 deletions

View File

@@ -69,4 +69,4 @@ namespace OpenSim.Data.PGSQL
}
}
}
}
}