Kauê Morelli kauemorelli

## referenceContainers.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              2 stars
            
          
                kauemorelli
                / referenceContainers.md
            
            
              Last active
              April 4, 2018 18:35
            
              
                Referencia de Containers (referenceContainer) Disponiveis no Magento 2 Reference Containers
              
          
    Em uma CMS Pages:

page.top: After Page Header
top.container: After Page Header Top
columns.top: Before Main Columns
page.bottom: Before Page Footer
page.bottom.container: Before Page Footer Container
cms_footer_links_container: CMS Footer Links
content: Main Content Area
content.aside" Main Content Aside


## resolveConflict.sh
#!/bin/bash

# Functions
function branchInicial {
	git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \1/'
}
function fileToCommit {
	#git whatchanged -1 --format=oneline | wc -l
	git ls-files --others -m --exclude-standard | wc -l
}
	#!/bin/bash

	# Functions
	function branchInicial {
	git branch 2> /dev/null \| sed -e '/^[^]/d' -e 's/ \(.*\)/ \1/'
	}
	function fileToCommit {
	#git whatchanged -1 --format=oneline \| wc -l
	git ls-files --others -m --exclude-standard \| wc -l
	}