diff options
| author | Mark Otto <[email protected]> | 2015-05-27 15:49:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-05-27 15:49:55 -0700 |
| commit | 663576a7ae77fb3f6143ce59ea16511cdaf8e9c3 (patch) | |
| tree | 4c205f99d57e85308abc01ee431b6008bdf8c641 /docs/examples/carousel/index.html | |
| parent | bd971c49b0883452af2e1278a8628eaf351504a1 (diff) | |
| parent | 3fe894ba3620c7e5d2e040f83948488d1911aedc (diff) | |
| download | bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.tar.xz bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.css.map
docs/assets/css/docs.min.css
Diffstat (limited to 'docs/examples/carousel/index.html')
| -rw-r--r-- | docs/examples/carousel/index.html | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 3e88fd0ff..4e11922ff 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -51,13 +51,8 @@ <li data-target="#myCarousel" data-slide-to="2"></li> </ol> <div class="carousel-inner" role="listbox"> -<<<<<<< HEAD <div class="carousel-item active"> - <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide"> -======= - <div class="item active"> <img class="first-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide"> ->>>>>>> master <div class="container"> <div class="carousel-caption text-left"> <h1>Example headline.</h1> @@ -66,13 +61,8 @@ </div> </div> </div> -<<<<<<< HEAD <div class="carousel-item"> - <img src="data:image/gif;base64,R0lGODlhAQABAIAAAGZmZgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Second slide"> -======= - <div class="item"> <img class="second-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Second slide"> ->>>>>>> master <div class="container"> <div class="carousel-caption"> <h1>Another example headline.</h1> @@ -81,13 +71,8 @@ </div> </div> </div> -<<<<<<< HEAD <div class="carousel-item"> - <img src="data:image/gif;base64,R0lGODlhAQABAIAAAFVVVQAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide"> -======= - <div class="item"> <img class="third-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide"> ->>>>>>> master <div class="container"> <div class="carousel-caption text-right"> <h1>One more for good measure.</h1> |