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)
commitd63fce520c7421532474f03beff5c2982b841ed7
tree9485eb2f55eee8ccfe33d5e74d5202d89d2276f9
parenta135e83de4ac6775a1bc3d608fcadf9e76c8b70d
parent79fa284cc99279dbdec9d66ef2b4573ccab91e98
fix conflict
Pman.Tab.AdminEnum.bjs
Pman.Tab.AdminEnum.js