update

eddiewentw · Mar 28, 2015 · fe1a06b · fe1a06b
1 parent 9a73f6b
commit fe1a06b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/fallwall.js b/fallwall.js
@@ -32,11 +32,7 @@
 			'margin-left': settings.margin_left,
 			'margin-right': settings.margin_right,
 			'color': settings.color,
-<<<<<<< HEAD
 			'width': Math.floor( ( this.width() - ( parseInt(settings.margin_left) + parseInt(settings.margin_right) +0 ) *settings.columnNumber ) / settings.columnNumber )
-=======
-			'width': Math.floor( ( this.width() - ( parseInt(settings.margin_left) + parseInt(settings.margin_right) +4 ) *settings.columnNumber ) / settings.columnNumber )
->>>>>>> efaf4086fc5ae57801f692daf1b7d8a4cbc5ca48
 		});
 
 		setContentAtFirst( dataArray, callback_func );