Attempt to merge into lp:tapaal failed due to conflicts:
text conflict in src/pipe/gui/AnimationController.java
« Back to merge proposal
Attempt to merge into lp:tapaal failed due to conflicts:
text conflict in src/pipe/ gui/AnimationCo ntroller. java