From 4e82c9a703c5ba91cfe7605bf4c6f59f8d9180cb Mon Sep 17 00:00:00 2001
From: iv <isabelle.vallet@nexedi.com>
Date: Wed, 14 Jun 2017 13:51:30 +0000
Subject: [PATCH] NayuOS: Fix merge error

---
 software/nayuos/software.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/nayuos/software.cfg b/software/nayuos/software.cfg
index 7663b263c..9a367234c 100644
--- a/software/nayuos/software.cfg
+++ b/software/nayuos/software.cfg
@@ -9,7 +9,7 @@ parts +=
   template-instance
 
 [versions]
-slapos.recipe.template = 2.9
+slapos.recipe.template = 3.0
 
 [template-instance]
 # create the instance.cfg file in the buildout directory
-- 
2.30.9