Permalink
Browse files

Update README.md

  • Loading branch information...
adrianj98 committed Sep 12, 2012
1 parent 51c0b71 commit 95675d83420f4925efb88074f09f033ebc565553
Showing with 1 addition and 2 deletions.
  1. +1 −2 README.md
View
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
PHPJasperXML
============
@@ -59,4 +58,4 @@ but run natively in PHP. This project is completely difference from
php-java bridge, a wrapper class will convered report element from jrxml
and pass to tcpdf/PHPExcel class.
->>>>>>> Put read me msg
+

0 comments on commit 95675d8

Please sign in to comment.