Commit 9bf58ccd authored by adrien's avatar adrien

solve conflict

parent b147a505
......@@ -28,11 +28,7 @@ actorfilter=\u30a2\u30af\u30bf\u30fc\u30d5\u30a3\u30eb\u30bf\u30fc
validator=\u30d0\u30ea\u30c7\u30fc\u30bf
datatypes=\u30c7\u30fc\u30bf\u578b
missingJarFileInRepository={0} \u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
<<<<<<< HEAD
add=\u8ffd\u52a0
=======
add=\u8ffd\u52a0...
>>>>>>> branch 'master' of git@github.com:bonitasoft/bonita-studio-sp.git
remove=\u524a\u9664
others=\u305d\u306e\u4ed6
groovyScripts=Groovy\u30b9\u30af\u30ea\u30d7\u30c8
......
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