@inproceedings{TUW-191394, author = {Kaufmann, Petra and Wieland, Konrad and Kappel, Gerti}, title = {Conflict Resolution in Model Versioning}, booktitle = {1st International Master Class on Model-Driven Engineering, Poster Session Companion}, year = {2010}, pages = {17--18}, url = {http://publik.tuwien.ac.at/files/PubDat_191394.pdf}, note = {Posterpr{\"a}sentation: 1st International Master Class on Model-Driven Engineering, Oslo, Norwegen; 2010-09-30 -- 2010-10-02} }