aecbb273d3
Conflicts: 3.0/modules/user_info/module.info Signed-off-by: Charles Knowlton <neosmith@tuffmail.com>
8 lines
147 B
Plaintext
8 lines
147 B
Plaintext
name = "User Info"
|
|
description = "Login Information"
|
|
<<<<<<< HEAD
|
|
version = 2
|
|
=======
|
|
version = 1
|
|
>>>>>>> d537136570ba6c51df8b572901e395018d9ef629
|