Author: dmagda
Date: Wed Nov 27 19:36:46 2019
New Revision: 1870521
URL: http://svn.apache.org/viewvc?rev=1870521&view=rev
Log:
Fixed download page
Modified:
ignite/site/trunk/download.html
Modified: ignite/site/trunk/download.html
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/download.html?rev=1870521&r1=1870520&r2=1870521&view=diff
==============================================================================
--- ignite/site/trunk/download.html (original)
+++ ignite/site/trunk/download.html Wed Nov 27 19:36:46 2019
@@ -1876,31 +1876,12 @@ under the License.
or trademarks The Apache Software Foundation.
</p>
<ul class="social-networks list-unstyled">
-<<<<<<< .mine
- <li><a
href="https://www.linkedin.com/company/apache-ignite"; aria-label="Linkedin"
class="icon-linkedin"
- target="_blank" rel="noopener"></a></li>
- <li><a href="https://twitter.com/ApacheIgnite";
aria-label="Twitter" class="icon-twitter" target="_blank"
rel="noopener"></a></li>
- <li><a
href="https://plus.google.com/109419715166167783665"; aria-label="Google"
class="icon-google-plus"
- target="_blank" rel="noopener"></a></li>
- <li><a
href="https://www.facebook.com/Apache-Ignite-813431118713318/";
aria-label="Facebook" class="icon-facebook"
- target="_blank" rel="noopener"></a></li>
-||||||| .r1870163
- <li><a
href="https://www.linkedin.com/company/apache-ignite"; class="icon-linkedin"
- target="_blank"></a></li>
- <li><a href="https://twitter.com/ApacheIgnite";
class="icon-twitter" target="_blank"></a></li>
- <li><a
href="https://plus.google.com/109419715166167783665"; class="icon-google-plus"
- target="_blank"></a></li>
- <li><a
href="https://www.facebook.com/Apache-Ignite-813431118713318/";
class="icon-facebook"
- target="_blank"></a></li>
-=======
- <li><a
href="https://www.linkedin.com/company/apache-ignite"; class="icon-linkedin"
- target="_blank" rel="noopener"></a></li>
- <li><a href="https://twitter.com/ApacheIgnite";
class="icon-twitter" target="_blank" rel="noopener"></a></li>
- <li><a
href="https://plus.google.com/109419715166167783665"; class="icon-google-plus"
- target="_blank" rel="noopener"></a></li>
- <li><a
href="https://www.facebook.com/Apache-Ignite-813431118713318/";
class="icon-facebook"
- target="_blank" rel="noopener"></a></li>
->>>>>>> .r1870517
+ <ul class="social-networks list-unstyled">
+ <li><a
href="https://www.linkedin.com/company/apache-ignite"; aria-label="Linkedin"
class="icon-linkedin" target="_blank" rel="noopener"></a></li>
+ <li><a href="https://twitter.com/ApacheIgnite";
aria-label="Twitter" class="icon-twitter" target="_blank"
rel="noopener"></a></li>
+ <li><a
href="https://plus.google.com/109419715166167783665"; aria-label="Google Plus"
class="icon-google-plus" target="_blank" rel="noopener"></a></li>
+ <li><a
href="https://www.facebook.com/Apache-Ignite-813431118713318/";
aria-label="Facebook" class="icon-facebook" target="_blank"
rel="noopener"></a></li>
+ </ul>
</ul>
</div>
</div>
