diff options
| author | spider@app2 <spiderr@bitweaver.org> | 2016-07-27 16:46:05 -0400 |
|---|---|---|
| committer | spider@app2 <spiderr@bitweaver.org> | 2016-07-27 16:46:05 -0400 |
| commit | a292380152393a02f410b23da8f105eed37de315 (patch) | |
| tree | 8043fffe6f7a6185e6cc95ca987fa4eaec685326 /templates | |
| parent | b0750d2a6ddb0a6dadae9b848c6a92aa4a4aad41 (diff) | |
| download | fisheye-a292380152393a02f410b23da8f105eed37de315.tar.gz fisheye-a292380152393a02f410b23da8f105eed37de315.tar.bz2 fisheye-a292380152393a02f410b23da8f105eed37de315.zip | |
resolve conflict
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/image_order.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/image_order.tpl b/templates/image_order.tpl index 5125f59..154819c 100644 --- a/templates/image_order.tpl +++ b/templates/image_order.tpl @@ -145,7 +145,7 @@ </div> <div class="form-group submit"> - <input type="submit" class="btn btn-default" name="cancel" value="{tr}Back{/tr}"/> <input type="submit" class="btn btn-primary" name="save_order" value="{tr}Save Changes{/tr}"/> + <input type="submit" class="btn btn-default" name="cancel" value="{tr}Back{/tr}"/> <input type="submit" class="btn btn-primary" name="save_order" value="{tr}Save{/tr}"/> </div> {/form} </div><!-- end .body --> |