fix conflict
authorMicheal <micheal@roojs.com>
Mon, 26 Jan 2015 05:48:35 +0000 (13:48 +0800)
committerMicheal <micheal@roojs.com>
Mon, 26 Jan 2015 05:48:35 +0000 (13:48 +0800)
1  2 
Pman.Tab.AdminEnum.bjs
Pman.Tab.AdminEnum.js

Simple merge
Simple merge