Can you change "will be seen" to "can be seen" in your descriptive text?

-Lyla


On Mon, Mar 17, 2014 at 5:35 PM, David Ormsbee <notifications@github.com>wrote:

> In
> apps/openassessment/templates/openassessmentblock/grade/oa_grade_complete.html:
>
> > +                    <ol class="list list--fields submission__feeedback__fields">
> > +                        <li class="field field--select feedback__overall" id="feedback__overall">
> > +                            <label for="feedback__overall__value">Overall how do you consider your peers' assessments of your response?</label>
> > +                            <select id="feedback__overall__value">
> > +                                <option>The feedback was very helpful</option>
> > +                                <option>The feedback was helpful</option>
> > +                                <option>The feedback was not helpful</option>
> > +                            </select>
> > +                        </li>
> > +                        <li class="field field--textarea feedback__remarks" id="feedback__remarks">
> > +                            <label for="feedback__remarks__value">Please provide any thoughts or comments on the feedback you received from your peers here.</label>
> > +                            <textarea id="feedback__remarks__value" placeholder="I feel the feedback I received was...">{{ feedback_text }}</textarea>
> > +                        </li>
> > +                    </ol>
> > +                </div>
> > +>>>>>>> adding in instruction-based text to peer assessment feedback form
>
> Merge conflict leftover?
>
> --
> Reply to this email directly or view it on GitHub<https://github.com/edx/edx-tim/pull/154/files#r10680181>
> .
>