diff options
| author | jrayhawk+piny.be@omgwallhack.org <jrayhawk@piny.svcs.cs.pdx.edu> | 2010-09-03 01:28:46 -0700 |
|---|---|---|
| committer | jrayhawk+piny.be@omgwallhack.org <jrayhawk@piny.svcs.cs.pdx.edu> | 2010-09-03 01:28:46 -0700 |
| commit | bd628ee4a22ab90a0ce09f5f86c3528bac37b4af (patch) | |
| tree | c0e9f3a5d1667770910267b9ba700a49de2c16bf /srv/templates/editconflict.tmpl | |
| parent | 59892ab382d643c294ca7383eec2e1e658fdc783 (diff) | |
| parent | e076ea9eef2e310fd0f783279b4f0c7f6a4a4a59 (diff) | |
| download | piny-code-bd628ee4a22ab90a0ce09f5f86c3528bac37b4af.tar.gz piny-code-bd628ee4a22ab90a0ce09f5f86c3528bac37b4af.zip | |
Merge branch 'master' of git+ssh://piny.be/srv/git/piny-code
Diffstat (limited to 'srv/templates/editconflict.tmpl')
| -rw-r--r-- | srv/templates/editconflict.tmpl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/srv/templates/editconflict.tmpl b/srv/templates/editconflict.tmpl deleted file mode 100644 index 1252033..0000000 --- a/srv/templates/editconflict.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -<p class="error"> -<b>Your changes conflict with other changes made to the page.</b> -</p> -<p> -Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -</p> |