commit 6ba1f34532a86bea81d9a1262abc8c930c01f96b
author Varun Saxena <varunsaxena@apache.org> Sun Oct 15 01:25:32 2017 +0530
committer Varun Saxena <varunsaxena@apache.org> Tue Oct 17 23:36:41 2017 +0530
tree da98ea5a462a614a11b5a4634441682d3eedb664
parent 572ebd1a950a70370080949499f8cec85c4a0d9e

Fix problems in yarn.cmd due to rebase.

hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd

diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
index 48e3199..8415163 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
@@ -246,16 +246,15 @@
   )
   goto :eof
 
-<<<<<<< HEAD
 :router
   set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\router-config\log4j.properties
   set CLASS=org.apache.hadoop.yarn.server.router.Router
   set YARN_OPTS=%YARN_OPTS% %HADOOP_ROUTER_OPTS%
-=======
+  goto :eof
+
 :timelinereader
   set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\timelineserver-config\log4j.properties
   set CLASS=org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer
->>>>>>> YARN-5355. Backported YARN-2928 into our branch-2 feature branch.
   goto :eof
 
 :nodemanager