prog694/joebot — comment on commit 41ee8484aa10129c174f186748e872263e7dcf89
File: joebot.test/nbproject/build-impl.xml line 506
By acarrillo:

Are any of these lines different? Is there a "right" way to merge these xml conflicts?