Merge branch 'master' into subtree

[fanfix.git] / test / ConversionTest.java

diff --git a/src/be/nikiroo/fanfix/test/ConversionTest.java b/test/ConversionTest.java
similarity index 100%
rename from src/be/nikiroo/fanfix/test/ConversionTest.java
rename to test/ConversionTest.java