From 49fbc9bd544425973f0c48b4f57e9300015e2836 Mon Sep 17 00:00:00 2001
From: alazo <alain.zosso@webzos.com>
Date: Wed, 8 Mar 2017 12:00:52 +0100
Subject: [PATCH] process_eval_2

---
 cms/migrations/0019_merge_20170308_1159.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 cms/migrations/0019_merge_20170308_1159.py

diff --git a/cms/migrations/0019_merge_20170308_1159.py b/cms/migrations/0019_merge_20170308_1159.py
new file mode 100644
index 0000000..c89cb9b
--- /dev/null
+++ b/cms/migrations/0019_merge_20170308_1159.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2017-03-08 10:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0018_competence_processus_eval'),
+        ('cms', '0017_auto_20170308_0437'),
+    ]
+
+    operations = [
+    ]