|  | @@ -1,8 +1,5 @@
 | 
	
		
			
				|  |  | -#Mon Mar 06 14:32:14 ART 2017
 | 
	
		
			
				|  |  | +#Tue Mar 07 18:31:53 ART 2017
 | 
	
		
			
				|  |  |  nexus.index.chain-id=1383265801149
 | 
	
		
			
				|  |  | ->>>>>>>=master
 | 
	
		
			
				|  |  | +nexus.index.timestamp=20170307213153.636 +0000
 | 
	
		
			
				|  |  |  nexus.index.id=rosjava_mvn_repo
 | 
	
		
			
				|  |  | -nexus.index.timestamp=20170306173213.895 +0000
 | 
	
		
			
				|  |  | -<<<<<<<=HEAD
 | 
	
		
			
				|  |  | -=\=\=\=\=\=\=
 | 
	
		
			
				|  |  |  nexus.index.last-incremental=0
 |