Code Raguet code-sur

## README.md

      
              2 files
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                code-sur
                / README.md
            
            
              Last active
              November 2, 2017 18:22
            
              
                Merge conflict
              
          
    Para hacer un conflict

git clone https://gist.github.com/dfa79a7bf0248bc88c35c5b1a1b320a4.git conflict
cd conflict
Modificar línea <nombre> de archivo_conflictivo.txt

  
## activity.js
'use strict';
/* Here my own activity specific config */
requirejs.config({
    paths: {
        angular: "angular/angular"
    },
    shim: {
        angular: {
            exports: 'angular'
        }

## .gitignore
*.pyc
	'use strict';
	/* Here my own activity specific config */
	requirejs.config({
	paths: {
	angular: "angular/angular"
	},
	shim: {
	angular: {
	exports: 'angular'
	}