User:Thejoppyloppy: Difference between revisions
From Test Wiki
Content deleted Content added
| Line 2: | Line 2: | ||
==merge notes== |
==merge notes== |
||
| ⚫ | |||
*left, or orange border indicates the history present on [[/sandbox/mergeold]] |
*left, or orange border indicates the history present on [[/sandbox/mergeold]] |
||
*right or blue border indicates the history present on [[/sandbox/mergenew]] |
*right or blue border indicates the history present on [[/sandbox/mergenew]] |
||
| ⚫ | |||
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
||
*<div class="mergeold">Created [[/sandbox/mergeold]]</div> |
*<div class="mergeold">Created [[/sandbox/mergeold]]</div> |
||
