easylinux/BootstrapPageGenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from Devex/master

Browse Source 
testing PR
This commit is contained in:
Jesús Herman Marina
2015-12-04 15:13:31 +01:00
parent 846faf1d42 900deefb03
commit 5776cfed4e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
index.html
View File

@@ -7,15 +7,12 @@
<meta name="title" content="Create page with Bootstrap">
<meta name="description" content="Create page with Bootstrap">
<meta name="keywords" content="Create page with Bootstrap">
<title>Bootstrap Layout</title>
<title>Devex Bootstrap Layout Builder</title>
<!-- Le styles -->
<<<<<<< HEAD
<!-- <link href="css/bootstrap-combined.min.css" rel="stylesheet"> -->
<link rel="stylesheet" href="https://d23nuec95rapgw.cloudfront.net/apps/front_end/assets/ui_toolbox/main-67121e1c236c4e6e808a64009b92cc7851813910fee5e66185ebbf45d7ee9756.css">
=======
<link href="css/toolbox.css" rel="stylesheet">
>>>>>>> 09a95fb991d265e9eb8ac7eac63c4c6813e244a8
<link href="css/layoutit.css" rel="stylesheet">
<link href="css/docs.min.css" rel="stylesheet">
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">