search

AmpersandTarski / Ampersand

Build database applications faster than anyone else, and keep your data pollution free as a bonus.
http://ampersandtarski.github.io/
GNU General Public License v3.0
40 stars 8 forks source link

Issue/1262 fix wrong merge conflict resolution #1265

Closed Michiel-s closed 2 years ago

Michiel-s commented 2 years ago

Fix for #1262