developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

breadcrumb widget of back-end has done, front-end has bug...

Browse Source 
Conflicts:

	app/controllers/front_controller.rb
	app/views/front/show_breadcrumb.html.erb
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
This commit is contained in:
Rueshyna authored and chris committed 2013-02-19 17:39:41 +08:00
1 parent 29b8fec89a
commit f3bfe67e68
2 files changed
+102
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/parsers/parser_common.rb
+3
View File
@@ -207,7 +207,10 @@ module ParserCommon
''
end
end
<<<<<<< HEAD
=======
>>>>>>> cf956ac... breadcrumb widget of back-end has done, front-end has bug...
# sitemap
def parse_sitemaps_edit(body = nil, page = nil, edit=nil)
sitemap = body.css('sitemap').first