Django Forms and Templates Sample Django app for educational use. This app demonstrates basic form and model use in Django. Writing on same line to force a merge conflict. Try to get both lines here! Test change of line 6 on Readme. Test Line for merge conflict.