From 2bc979ad00c157b172fd0c81728d3545376f746a Mon Sep 17 00:00:00 2001 From: Mavis Ou Date: Wed, 24 Jan 2018 09:33:54 -0800 Subject: [PATCH] fixed merge conflicts --- network-api/networkapi/fellows/templates/fellows_home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-api/networkapi/fellows/templates/fellows_home.html b/network-api/networkapi/fellows/templates/fellows_home.html index aa0cfaf2583..350f9cfe94b 100644 --- a/network-api/networkapi/fellows/templates/fellows_home.html +++ b/network-api/networkapi/fellows/templates/fellows_home.html @@ -13,7 +13,7 @@

Fellowships

{% block body %}
-
+

What are Fellowships?