From 3edb6437fb53eeae5022917d1ced4b75de333488 Mon Sep 17 00:00:00 2001
From: Alberto Pose <albertopose@gmail.com>
Date: Thu, 29 Nov 2012 15:36:52 -0300
Subject: [PATCH] Fixing merge problem

---
 src/main/template/operation.handlebars | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/template/operation.handlebars b/src/main/template/operation.handlebars
index 3f52a1f9..e46febb8 100644
--- a/src/main/template/operation.handlebars
+++ b/src/main/template/operation.handlebars
@@ -23,11 +23,9 @@
                 {{/if}}
                 {{#if responseClass}}
                     <h4>Response Class</h4>
-                    {{#if responseClassSignature}}
-                        <p><span class="model-signature"></span></p>
-                    {{else}}
-                        <p>{{{responseClass}}}</p>
-                    {{/if}}
+                    <p><span class="model-signature" /></p>
+                    <br/>
+                    <div class="content-type" />
                 {{/if}}
                 <form accept-charset='UTF-8' class='sandbox'>
                     <div style='margin:0;padding:0;display:inline'></div>
@@ -81,4 +79,4 @@
                 </div>
             </div>
         </li>
-    </ul>
\ No newline at end of file
+    </ul>