From 47535ab08afeb48fbb00f03e68d6ff973cf62cbd Mon Sep 17 00:00:00 2001
From: Abhinav Dronamraju
Date: Fri, 10 Nov 2017 14:59:26 +0530
Subject: Functions added

---
 help/en_US/scilab_en_US_help/jhelptoc.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'help/en_US/scilab_en_US_help/jhelptoc.xml')

diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml
index 0fd1d32..d47d3dc 100644
--- a/help/en_US/scilab_en_US_help/jhelptoc.xml
+++ b/help/en_US/scilab_en_US_help/jhelptoc.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">
 <toc version="1.0">
 <tocitem target="index" text="FOSSEE Signal Processing Toolbox">
-<<<<<<< HEAD
 <tocitem target="section_5118e822ecc2888aa80042108de4932e" text="FOSSEE Signal Processing Toolbox">
-=======
-<tocitem target="section_cc2bc01c47967d47fcf3507a91d572ba" text="FOSSEE Signal Processing Toolbox">
->>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
 <tocitem target="ac2poly" text="ac2poly"/>
 <tocitem target="ac2rc" text="ac2rc"/>
 <tocitem target="arParEst" text="arParEst"/>
-- 
cgit