Merged [4993] from rcross@amsl.com:

changed CONFLICT_REVIEW_PATH from conflict_reviews to conflict-reviews
 - Legacy-Id: 5010
Note: SVN reference [4993] has been migrated to Git commit 4d3f882

Author: levkowetz

ietf/settings.py

@@ -203,7 +203,7 @@
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
 CHARTER_PATH = '/a/www/ietf-ftp/charters/'
 CHARTER_TXT_URL = 'http://www.ietf.org/charter/'
-CONFLICT_REVIEW_PATH = '/a/www/ietf-ftp/conflict_reviews'
+CONFLICT_REVIEW_PATH = '/a/www/ietf-ftp/conflict-reviews'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s'
 MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s'