tmp.diff
ykzhujiang (Jiang Zhu)
Actions

Authored By

	ykzhujiang
	Jan 28 2015, 11:52 AM

Size

705 B

Referenced Files

None

Subscribers

None

tmp.diff
View Options

	Index: templates/index.html.tpl
	===================================================================
	--- templates/index.html.tpl (revision 105169)
	+++ templates/index.html.tpl (working copy)
	@@ -2,6 +2,7 @@

	{% block initjs %}
	<script>
	+ //我又改了一行
	var aaa = {
	'全国': '全国',
	'北京市': '北京',
	@@ -661,8 +662,7 @@
	xxx(operator);
	bbb.ccc();
	});
	-
	- //ddd
	+ //测试一下
	ddd();
	}
	yyy(loadComplete, 5);

	___________________________________________________________________
	已修改: svn:mergeinfo
	已经合并 /ggg/ttt/trunk/src/http/service.py:r105126-105449