From 900deefb031b28d61dc7d221129a932612e09a27 Mon Sep 17 00:00:00 2001
From: Jesus Herman <jesus.herman@devex.com>
Date: Fri, 4 Dec 2015 15:12:32 +0100
Subject: [PATCH] changed title testing PR

---
 index.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 4276b3f..3cd5944 100644
--- a/index.html
+++ b/index.html
@@ -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">