Commit fbbd76e2 authored by Matthias Sommerfeld's avatar Matthias Sommerfeld

Edit merge conflicts

parent e4b6d043
......@@ -54,12 +54,10 @@ namespace Mso\IdnaConvert;
class IdnaConvert {
const Version = '1.0.2';
const Version = '1.1.0';
const SubVersion = 'main';
// Internal settings, do not touch!
protected $encoding = 'utf8'; // Default input charset is UTF-8
protected $strictMode = false; // Behave strict or not
protected $idnVersion = '2008'; // Can be either 2003 (old) or 2008 (default)
......
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