Support for building Fuel behind a http proxy

[fuel.git] / INFO

diff --git a/INFO b/INFO
index 251e9ea..892db07 100644 (file)
--- a/INFO
+++ b/INFO
@@ -6,7 +6,7 @@ Primary Contact:  jonas.bjurel@ericsson.com
 Project Lead: jonas.bjurel@ericsson.com
 Jira Project Name: Fuel based OPNFV installer
 Jira Project Prefix: FUEL
-Mailing list tag: [Fuel]
+Mailing list tag: [fuel]
 IRC: Server:freenode.net Channel:#opnfv-fuel
 Repository: fuel
 
@@ -18,6 +18,5 @@ szilard.cserey@ericsson.com
 mskalski@mirantis.com
 ruijing.guo@intel.com
 
-<<<<<<< HEAD
 Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-07-13.59.log.html
 Link(s) to approval of additional committers: