| commit | 1e6e927eea306eda17e8966215d4f57566472bf2 | [log] [tgz] |
|---|---|---|
| author | YILI <li.yi101@zte.com.cn> | Tue Mar 14 09:51:58 2017 +0800 |
| committer | 6092002077 <li.yi101@zte.com.cn> | Tue Mar 14 09:51:58 2017 +0800 |
| tree | ed1e4b64d9d37340835c7d3527a0c025f490562d | |
| parent | 108730b2f8fe2a95e826bc0144ad84a632a92656 [diff] |
Resolve the merge conflict read rule manager gui list,inclode query and table list Issue-ID:CLIENT-151 Change-Id: Ie5b932cef60f86e106e074565ab1a249ec0c5125 Signed-off-by: YILI <li.yi101@zte.com.cn>