Commit e10136f7 authored by Paolo Pecis's avatar Paolo Pecis

Solved merge problems

parent e532fb77
......@@ -2,3 +2,4 @@
.DS_Store
.DS_Store
.DS_Store
.DS_Store
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment