{"shas":[["12f55bf94c1ac833191ee8697bb0e46e8fdea301","b138536927d82ec2069c559b0e8ea05f0d3fdacd@foundersc.com","Merge conflict source file.\n\nMerge branch 'master' of github.com:dcaoyuan/aiotrade\n\nConflicts:\n\tlibs/lib.securities/src/main/scala/org/aiotrade/lib/securities/model/Exchange.scala\n\tlibs/lib.securities/src/main/scala/org/aiotrade/lib/securities/model/PriceDistribution.scala\n\tlibs/lib.securities/src/main/scala/org/aiotrade/lib/securities/model/Sec.scala","Huang Yingjin"]],"ref":"refs/heads/master","size":1,"head":"12f55bf94c1ac833191ee8697bb0e46e8fdea301","push_id":39770408}