fixe Jonathan forced merge

jedi4ever · Apr 12, 2013 · 3837e39 · 3837e39
1 parent f7bfe67
commit 3837e39
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/...-amsterdam/proposals/JonathanWeiss_ContinuousDeploymentandIntegrationintheCloud/index.txt b/...-amsterdam/proposals/JonathanWeiss_ContinuousDeploymentandIntegrationintheCloud/index.txt
@@ -8,11 +8,8 @@ proposal: true
 talk: true
 selected: false
 layout: event
-<<<<<<< HEAD:site/content/events/2013-amsterdam/proposals/KaminaAisola_ContinuousDeploymentandIntegrationintheCloud/index.txt
 author: Amazon Web Services Engineer
-=======
 author: Jonathan Weiss
->>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea:site/content/events/2013-amsterdam/proposals/JonathanWeiss_ContinuousDeploymentandIntegrationintheCloud/index.txt
 title: "Continuous Deployment and Integration in the Cloud"
 ---