From 25a2e1c5eb21a18caccc7a9435d835a3f5e7f3a0 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 14 May 2012 10:37:03 -0700
Subject: More merge problems

---
 js/lib/geom/geom-obj.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'js/lib/geom/geom-obj.js')

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 6f37ad1c..6b73463f 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -325,11 +325,9 @@ exports.GeomObj = Object.create(Object.prototype, {
             if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
                 var nMats = this._materialArray.length;
                 if (nMats > 0) {
-				{
                     var arr = [];
 
                     for (var i = 0; i < nMats; i++) {
-					{
                         var matObj =
                         {
                             'materialNodeName':this._materialNodeArray[i].name,
-- 
cgit v1.2.3