fix conflict logical in properties namesapce.

[JaredTan95]

Verify whether to repeat in text mode, when adding properties config.

[codecov-io]

Codecov Report

Merging #2066 into master will increase coverage by 0.04%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##             master    #2066      +/-   ##
============================================
+ Coverage     49.99%   50.03%   +0.04%     
- Complexity     1979     1983       +4     
============================================
  Files           401      401              
  Lines         12411    12411              
  Branches       1279     1279              
============================================
+ Hits           6205     6210       +5     
+ Misses         5748     5744       -4     
+ Partials        458      457       -1

Impacted Files	Coverage Δ	Complexity Δ
...portal/component/txtresolver/PropertyResolver.java	89.53% <100%> (+3.48%)	44 <0> (+2)	⬆️
...mework/apollo/portal/component/PortalSettings.java	65.07% <0%> (-4.77%)	5% <0%> (ø)
...work/apollo/biz/message/DatabaseMessageSender.java	67.34% <0%> (+10.2%)	8% <0%> (+2%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1668fa1...cff4551. Read the comment docs.

[coveralls]

Coverage increased (+0.03%) to 53.718% when pulling cff4551 on JaredTan95:property_resolver into 1668fa1 on ctripcorp:master.

[nobodyiam]

LGTM