initial thridculture edits

tpl/_users/login.tpl

@@ -7,7 +7,11 @@
 %    if (~ $REQUEST_METHOD POST)
 %        echo '<div class="notify_errors">Login failed!</div>'
 <form method="POST" action="" style="text-align: right; float: left;">
+<<<<<<< HEAD
 <fieldset>
+=======
+<fieldset class="log">
+>>>>>>> tcremote/main
     <label>User name: <input type="text" name="user_name" value="%($"post_arg_user_name%)"/></label><br>
     <label>User password: <input type="password" name="user_password"></label><br>
     <input name="s" type="submit" value="Login">