Merge branch 'master' of https://github.com/boniatillo-com/PhaserEditor

PhaserEditor2D · PhaserEditor2D · commit 58184380d090 · 2016-11-30T16:24:57.000-05:00
Conflicts:
	source/phasereditor/phasereditor.assetpack.core/src/phasereditor/assetpack/core/AssetPackCore.java
diff --git a/source/phasereditor/phasereditor.assetpack.core/src/phasereditor/assetpack/core/AssetPackCore.java b/source/phasereditor/phasereditor.assetpack.core/src/phasereditor/assetpack/core/AssetPackCore.java
@@ -550,7 +550,7 @@ public static AssetPackModel getAssetPackModel(IFile file) throws Exception {
 	}
 
 	public static AssetPackModel getAssetPackModel(IFile file, boolean forceCreate) {
-		
+
 		synchronized (_filePackMap) {
 
 			if (_filePackMap.containsKey(file)) {

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ public static AssetPackModel getAssetPackModel(IFile file) throws Exception {`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`public static AssetPackModel getAssetPackModel(IFile file, boolean forceCreate) {`
`553`		`-`
	`553`	`+`
`554`	`554`	`synchronized (_filePackMap) {`
`555`	`555`
`556`	`556`	`if (_filePackMap.containsKey(file)) {`