weichenghsu

## $A.json
[
    "$deprecationUsages$",
    "$displayErrors$",
    "$logger$",
    "util",
    "$auraError$",
    "$auraFriendlyError$",
    "severity",
    "$lastKnownError$",
    "$localizationService$",

## Git_Commands.md

      
              2 files
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                weichenghsu
                / Git_Commands.md
            
            
              Last active
              November 1, 2017 18:04
            
              
                salesforce command line snippet
              
          
    discard conflict


both modified:   src/classes/PortalComponentStructureJSONTest.cls

git reset HEAD src/classes/PortalComponentStructureJSONTest.cls
	[
	"$deprecationUsages$",
	"$displayErrors$",
	"$logger$",
	"util",
	"$auraError$",
	"$auraFriendlyError$",
	"severity",
	"$lastKnownError$",
	"$localizationService$",