Permalink
Browse files

fixe Jonathan forced merge

  • Loading branch information...
1 parent f7bfe67 commit 3837e39c742d283837c782ad0332d3dc3984fa60 @jedi4ever committed Apr 12, 2013
@@ -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"
---

0 comments on commit 3837e39

Please sign in to comment.