dotCMS/dotCMS — pull request #1102 by prasadbhvn (2012-09-11 17:10:31+00:00)
Title: resolved conflicts  #1090

Resolved the conflicts in the content_form_macro.vtl file.

Now Custom Fields displaying on submit Content Macro.

Please Check.