{"shas":[["68ad9c21e4b885b3f0421f35babf438a9012b596","b7065c55bdacea408cedd07832d37c2d95a1ba93@sourcefabric.org","CS-3191: Unresolved conflicts on merging\nThere is no need to create this kind of files when working with a version control system.","Holman Romero"]],"ref":"refs/heads/devel","size":1,"head":"68ad9c21e4b885b3f0421f35babf438a9012b596","push_id":33879901}