From e5d2035e16999ccd607c7a1d72b4e2f42b9acf5a Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Mon, 2 Apr 2018 10:28:28 -0300
Subject: [PATCH] Fix conflict
---
src/libs/routes/api.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/libs/routes/api.js b/src/libs/routes/api.js
index e774e090..a629255b 100644
--- a/src/libs/routes/api.js
+++ b/src/libs/routes/api.js
@@ -60,11 +60,8 @@ const distributionFactor = require(`${libs}/routes/distributionFactor`);
const siope = require(`${libs}/routes/siope`);
-<<<<<<< HEAD
const outOfSchool = require(`${libs}/routes/outOfSchool`);
-=======
const classroomCount = require(`${libs}/routes/classroomCount`);
->>>>>>> classroom_count
api.get('/', (req, res) => {
res.json({ msg: 'SimCAQ API is running' });
--
GitLab