From 3fd785654372d493c031d9b541ab33a881023a32 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 26 Feb 2021 19:16:17 +0300
Subject: * switch to composer for qrcode and otp dependencies * move most
 OTP-related stuff into userhelper * remove old phpqrcode and otphp libraries

---
 lib/phpqrcode/tools/merged_header.php | 36 -----------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 lib/phpqrcode/tools/merged_header.php

(limited to 'lib/phpqrcode/tools/merged_header.php')

diff --git a/lib/phpqrcode/tools/merged_header.php b/lib/phpqrcode/tools/merged_header.php
deleted file mode 100644
index 25805e564..000000000
--- a/lib/phpqrcode/tools/merged_header.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * PHP QR Code encoder
- *
- * This file contains MERGED version of PHP QR Code library.
- * It was auto-generated from full version for your convenience.
- *
- * This merged version was configured to not requre any external files,
- * with disabled cache, error loging and weker but faster mask matching.
- * If you need tune it up please use non-merged version.
- *
- * For full version, documentation, examples of use please visit:
- *
- *    http://phpqrcode.sourceforge.net/
- *    https://sourceforge.net/projects/phpqrcode/
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
- 
\ No newline at end of file
-- 
cgit v1.2.3