[tode_st] [dalehenrich/tode] bbaabc: fix a merge error

  Branch: refs/heads/dev
  Home:   https://github.com/dalehenrich/tode
  Commit: bbaabca0fcf43833a700df5f9020859642c3eaf0
      https://github.com/dalehenrich/tode/commit/bbaabca0fcf43833a700df5f9020859642c3eaf0
  Author: Dale Henrichs <[hidden email]>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
    M repository/Tode-GemStone-Server-Core.package/TDGitMergeOperation.class/instance/applyTo..st
    M repository/Tode-GemStone-Server-Core.package/TDGitMergeOperation.class/methodProperties.json
    M repository/Tode-GemStone-Server-Core.package/monticello.meta/version

  Log Message:
  -----------
  fix a merge error


  Commit: ad21a61af536705003fd34061bc14cb1e3e6f6c8
      https://github.com/dalehenrich/tode/commit/ad21a61af536705003fd34061bc14cb1e3e6f6c8
  Author: Dale Henrichs <[hidden email]>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
    M repository/Topez-Server-Core.package/TDBehaviorReferenceDefinition.class/class/classOrganizerFor..st
    M repository/Topez-Server-Core.package/TDBehaviorReferenceDefinition.class/instance/username.st
    M repository/Topez-Server-Core.package/TDBehaviorReferenceDefinition.class/methodProperties.json
    M repository/Topez-Server-Core.package/TDClassAndMethodDefinitionsElementBuilder.class/methodProperties.json
    M repository/Topez-Server-Core.package/TDClassDefinition.class/methodProperties.json
    M repository/Topez-Server-Core.package/TDClassHierarchyListElementBuilder.class/methodProperties.json
    M repository/Topez-Server-Core.package/TDClientSourceElementBuilder.class/methodProperties.json
    M repository/Topez-Server-Core.package/monticello.meta/version

  Log Message:
  -----------
  tweak some of the lgic related to browsing class versions ... if the class version was created by the current user, then it is not necessary to define the username ... username present means that class version needs to be looked up from anothers user's symbol list


Compare: https://github.com/dalehenrich/tode/compare/253932024808...ad21a61af536

--
You received this message because you are subscribed to the Google Groups "tODE" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/d/optout.