search

aixm / donlon-outdated-

Previous AIXM 5.1 Donlon data set. No longer maintained.
14 stars 4 forks source link

Fix UUID mismatch (#12) #4

Closed vog closed 9 years ago

vog commented 10 years ago

There were two ways to fix this: Use consistently either UUID "c1bb..." or UUID "5909...".

From the document it was pretty clear that "c1bb..." is the correct UUID. First, this unit is referenced by "c1bb..." at other places. Second, there is already another feature with UUID "5909...".

porosnie commented 10 years ago

I would like to check this one before committing.

vog commented 10 years ago

@porosnie Do you need any additional information from me? Should I point out the relevant Donlon parts which made the situation clear to me?

vog commented 10 years ago

Fixed the pull request so it can be merged again. There was a formal conflict with another change that was trivial to solve.

porosnie commented 9 years ago

Volker, is this one OK to be committed? Are there no later changes that would conflict with it?

vog commented 9 years ago

Yes, it can be merged without any problems. GitHub shows that there are no formal conflicts, and I also don't see any possible non-obvious conflicts. Feel free to merge if you agree with that change.