/extremedating/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/extremedating/trunk

« back to all changes in this revision

Viewing changes to adduser.php

  • Committer: Gustav Hatvigsson
  • Date: 2013-04-13 20:03:20 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20130413200320-8csya4grh65wb9pf
fixed merge errors, and indentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
adduser.php
125
125
            </tr>
126
126
                              <tr>
127
127
              <td><input name="hiddenStuff" value="Something Strange" type="hidden"/></td>
128
 
<<<<<<< TREE
129
128
              <td><input id="inputbutton1" type="submit" action="./adduser.php" value="Registera mig"/></td>
130
 
                        </tr>
131
 
=======
132
 
              <td><input id="input" type="submit" action="./adduser.php" value="Registera mig"/></td>
133
 
                              </tr>
134
 
>>>>>>> MERGE-SOURCE
 
129
            </tr>
135
130
          </table>
136
131
        </form>
137
132
      <?php