Merge branch 'v3.0.x' into tr-integ

[freeradius.git] / raddb / mods-available / abfab_psk_sql

diff --git a/raddb/mods-available/abfab_psk_sql b/raddb/mods-available/abfab_psk_sql
index d75130d..022f79d 100644 (file)
--- a/raddb/mods-available/abfab_psk_sql
+++ b/raddb/mods-available/abfab_psk_sql
@@ -1,15 +1,25 @@
+<<<<<<< HEAD
+#Module for PSK authorizations from ABFAb trust router
+=======
 # -*- text -*-
 ##
 ## Module for PSK authorizations from ABFAB trust router
 ##
 ##     $Id$
 
+>>>>>>> v3.0.x
 sql psksql {
 
         driver = "rlm_sql_sqlite"
 
        sqlite {
                filename = "/var/lib/trust_router/keys"
+<<<<<<< HEAD
+               }
+
+       }
+=======
        }
 
 }
+>>>>>>> v3.0.x