fix conflicts
authorRobert Manea <gotmor@gmail.com>
Thu, 30 Jul 2009 13:24:00 +0000 (15:24 +0200)
committerRobert Manea <gotmor@gmail.com>
Thu, 30 Jul 2009 13:24:00 +0000 (15:24 +0200)
commit077384e8f189b74d3c78f64665942543d71ff1dd
treec3b3130e4523cddb55cf586727317b04397aa4ef
parenta3adc8f8c27fb8246bc8aa584aab4a589625a70c
fix conflicts
uzbl.c