resolve merge conflicts of 9d47cae to nyc-docs
am: d5cabb92bc
Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
sreevanis
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 13 KiB |
BIN
docs/html/auto/images/logos/auto/koenigsegg.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 21 KiB |
@@ -498,6 +498,12 @@ nonavpage=true
|
||||
</div>
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href=" http://koenigsegg.com/">
|
||||
<img src="/auto/images/logos/auto/koenigsegg.png"
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<a href=" http://www.lada.ru/en/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/lada.png"
|
||||
@@ -516,14 +522,14 @@ nonavpage=true
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href=" http://www.lincoln.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/lincoln.png"
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.mahindra.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/mahindra.png"
|
||||
@@ -542,15 +548,14 @@ nonavpage=true
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.mercedes-benz.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/mbenz.png"
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.mitsubishi-motors.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/mitsubishi.png"
|
||||
@@ -569,16 +574,14 @@ nonavpage=true
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.peugeot.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/peugeot.png"
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.ramtrucks.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/ram.png"
|
||||
@@ -597,15 +600,14 @@ nonavpage=true
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.seat.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/seat.png"
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.skoda-auto.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/skoda.png"
|
||||
@@ -624,16 +626,14 @@ nonavpage=true
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.globalsuzuki.com/automobile/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/suzuki.png"
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.tatamotors.com/">
|
||||
<img src="{@docRoot}auto/images/logos/auto/tata.png"
|
||||
@@ -652,8 +652,8 @@ nonavpage=true
|
||||
width="120" height="120" class="img-logo" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="cols cols-leftp">
|
||||
<div class="col-5">
|
||||
<a href="http://www.volvocars.com/intl">
|
||||
<img src="{@docRoot}auto/images/logos/auto/volvo.png"
|
||||
@@ -661,7 +661,6 @@ nonavpage=true
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="landing-section landing-red-background">
|
||||
|
||||