From 8e323d687091229d87dc244f5b67f473c28461db Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 19 Dec 2017 11:35:21 -0500
Subject: [PATCH 1/2] don't attempt to link contract if it's not in the code

---
 lib/contracts/deploy.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/contracts/deploy.js b/lib/contracts/deploy.js
index c9ea7ada..67dec724 100644
--- a/lib/contracts/deploy.js
+++ b/lib/contracts/deploy.js
@@ -109,6 +109,9 @@ class Deploy {
           deployedAddress = deployedAddress.substr(2);
         }
         let linkReference = '__' + filename + ":" + contractObj.className;
+        if (contractCode.indexOf(linkReference) < 0) {
+          continue;
+        }
         let toReplace = linkReference + "_".repeat(40 - linkReference.length);
         contractCode = contractCode.replace(new RegExp(toReplace, "g"), deployedAddress);
       }

From afd9d2f014e08eab1a34faa18e9fe52c6b12e3a7 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 19 Dec 2017 12:01:00 -0500
Subject: [PATCH 2/2] update to 2.6.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a30d6c55..b8bd51de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "embark",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Embark is a framework that allows you to easily develop and deploy DApps",
   "scripts": {
     "test": "grunt jshint && mocha test/ --no-timeouts && cd test_app/ && npm install && ../bin/embark test"