Resolve conflict

samuel-pt · Apr 13, 2016 · d3dd481 · d3dd481
1 parent df5c8c2
commit d3dd481
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template
@@ -226,7 +226,6 @@
 </property>
 
 <property>
-<<<<<<< HEAD
   <name>zeppelin.send.mail.on.execution.error</name>
   <value>true</value>
   <description>Send email with details if any paragraph execution resulted in error</description>