Fixed conflict
tree91111002ad622a3116a703f29646ba37ee9ea1bf
-rw-r--r-- 310 .gitignore
drwxr-xr-x - backend
drwxr-xr-x - database
drwxr-xr-x - irreco-metapack
drwxr-xr-x - irreco
drwxr-xr-x - irtrans
drwxr-xr-x - script
drwxr-xr-x - themes