ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-05-31 15:49:41 +03:00
Code Issues Projects Releases Wiki Activity

edmarketconnector.xml: Fix for accidental "bad merge" text

Browse Source
This commit is contained in:
Athanasius 2020-08-27 12:44:15 +01:00
parent a9a972fc90
commit cd21bb554c
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
edmarketconnector.xml
View File

@ -168,16 +168,11 @@
<!-- Windows --> <!-- Windows -->
<item> <item>
<<<<<<< HEAD
<title>Release 4.0.6</title> <title>Release 4.0.6</title>
=======
<title>Release 4.0.4</title>
>>>>>>> 62ff0424163ea4cff05d3d0b759d4bbc6645e702
<description> <description>
<![CDATA[ <![CDATA[
<style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style> <style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style>
<<<<<<< HEAD
<h2>Release 4.0.6</h2> <h2>Release 4.0.6</h2>
<ul> <ul>
<li>Correct the three System Provider plugins to <em>not</em> show the <em>next</em> system <li>Correct the three System Provider plugins to <em>not</em> show the <em>next</em> system
@ -193,8 +188,6 @@ jumps to new systems.</li>
<p>In general this cleans up the code for all three System and Station Providers; <p>In general this cleans up the code for all three System and Station Providers;
EDDB, EDSM, Inara.</p> EDDB, EDSM, Inara.</p>
=======
>>>>>>> 62ff0424163ea4cff05d3d0b759d4bbc6645e702
<h2>Release 4.0.4</h2> <h2>Release 4.0.4</h2>
<ul> <ul>
<li> <li>