[els_scroller.c] Removed unwanted merge codes.
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 23 Sep 2011 04:12:48 +0000 (13:12 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 23 Sep 2011 04:12:48 +0000 (13:12 +0900)
commit5993a60caec18a12f77981a14fcc01ba52eb65b4
tree1e3f64071b53c698862697e50d3076186d29e01c
parent4d8111721a07aa9308b79b157420188b5f0ca477
[els_scroller.c] Removed unwanted merge codes.
src/lib/els_scroller.c