From 8a3833ec119fede559cc71513d3993c68e487c74 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 12 Jun 2017 16:30:59 -0300
Subject: [PATCH] Merge issues

---
 graph/typeDefs.graphql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 5f2d5a8c3..a4c4b8c5c 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -112,7 +112,7 @@ input AssetsQuery {
 
   # Limit the number of results to be returned
   limit: Int = 10
-
+}
 ################################################################################
 ## Tags
 ################################################################################
@@ -155,7 +155,6 @@ type TagLink {
 
   # The date that the TagLink was created.
   created_at: Date!
->>>>>>> master
 }
 
 ################################################################################