merge conflicts
						commit
						662d015afd
					
				| 
						 | 
					@ -95,6 +95,6 @@
 | 
				
			||||||
    "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
 | 
					    "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
 | 
				
			||||||
    "socket": true,
 | 
					    "socket": true,
 | 
				
			||||||
    "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json",
 | 
					    "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json",
 | 
				
			||||||
    "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.5.zip",
 | 
					    "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.6.zip",
 | 
				
			||||||
    "license": "LICENCE.txt"
 | 
					    "license": "LICENCE.txt"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue