fixed ambiguous change that caused merge conflict

includes/ore_modals.php

@@ -77,12 +77,8 @@ static $modals = array(
         'markup' => '<p>If you have forgotten your password, you can request a reset. We need to know <em>one</em> of the   following: (1) the email address you used to register, or (2) your username.</p>'.
         '<div class="form-group">'.
             '<label for="credential">Enter your Username or Email to identify yourself.</label>'.
-<<<<<<< HEAD
-            '<input type="text" class="form-control" id="credential" name="credential" placeholder="username or user@email" value="{email}" aria-describedby="helpCredential">'.
-=======
             '<div id="ore-error-wrapper"></div>'.
-            '<input type="text" class="form-control" id="credential" name="credential" placeholder="username or user@email" value="{username}{email}" aria-describedby="helpCredential">'.
->>>>>>> 93e916cf3580e1693d4494a2240eed63c4c9b827
+            '<input type="text" class="form-control" id="credential" name="credential" placeholder="username or user@email" value="{email}" aria-describedby="helpCredential">'.
             '<span id="helpCredential" class="help-block">Either is acceptable, because both uniquely identify you in this system.</span>'.
         '</div>',
         'default' => array(