Diff for "SideBar"

Differences between revisions 12 and 18 (spanning 6 versions)

$/!\$ Edit conflict - other version:

Media/FLAG3_logo.png

$/!\$ Edit conflict - your version:

Media/FLAG3_logo.png

$/!\$ End of edit conflict

-  ⇤ ← Revision 12 as of 2017-08-24 09:00:47 → 
  Size: 333
  Editor: Admin
  Comment:
+   ← Revision 18 as of 2017-08-24 09:28:10 → ⇥
  Size: 544
  Editor: FlagAdmin
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-{{attachment:Media/FLAG3_logo.png||width=250}}
+---- /!\ '''Edit conflict - other version:''' ----
{{attachment:Media/FLAG3_logo.png||width=160}}
-Line 3:
+Line 4:
+---- /!\ '''Edit conflict - your version:''' ----
{{attachment:Media/FLAG3_logo.png||width=175}}

---- /!\ '''End of edit conflict''' ----
<<BR>>
<<BR>>