-
Notifications
You must be signed in to change notification settings - Fork 1
/
index.html.orig
52 lines (45 loc) · 1.96 KB
/
index.html.orig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
<!DOCTYPE html>
<html>
<head>
<meta charset='utf-8'>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen" />
<link rel="stylesheet" type="text/css" href="stylesheets/pygment_trac.css" media="screen" />
<link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" />
<title>Devops Mercenaries by devopsmercenaries</title>
</head>
<body>
<header>
<div class="container">
<h1>Devops Mercenaries</h1>
<h2>Devops Mercenaries presentations pages</h2>
<section id="links">
<a href="https://github.com/devopsmercenaries" class="btn btn-github"><span class="icon"></span>View on GitHub</a><br/>
<a href="https://twitter.com/DevopsMercs" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @DevopsMercs</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</section>
</div>
</header>
<div class="container">
<section id="main_content">
<<<<<<< HEAD
<p>1 : 10h40 - 11h30 Devops Brainstorming / Kanban des questions à répondre dans la journée</p>
</section>
<section id="main_content">
<p>2 : 11h45 - 12h35 Expériences heureuses/malheureuses avec DevOps</p>
</section>
<section id="main_content">
<p>3 : 13h30 - 14h20 DevOps : Quels outils et pour quoi faire ?</p>
</section>
<section id="main_content">
<p>4 : 14h35 - 15h25 DevOps : Culture du Delivery</p>
</section>
<section id="main_content">
<p>5 : 15h40 - 16h30 DevOps : je commence lundi !</p>
=======
<p>Devops Mercenaries @Devoxx</p>
>>>>>>> Devoxx 2014
</section>
</div>
</body>
</html>