userList newUser management .jsp
userList

Conflicts:
	build/classes/com/imagedb/AerialImgManage.class
	build/classes/com/imagedb/BigImgManage.class
	build/classes/com/imagedb/CollectManage.class
	build/classes/com/imagedb/DatabaseManage.class
	build/classes/com/imagedb/HotPntManage.class
	build/classes/com/imagedb/ImageDatabase.class
	build/classes/com/imagedb/ImageManage.class
	build/classes/com/imagedb/NormImgManage.class
	build/classes/com/imagedb/ThumbManage.class
	build/classes/com/imagedb/UserManage.class
	build/classes/com/lvg/action/HomeAction.class
	build/classes/com/lvg/action/UserAction.class
	build/classes/com/lvg/bean/GetImage.class
	build/classes/com/lvg/bean/Pagination.class
	build/classes/com/lvg/database/GetConnection.class
	build/classes/com/lvg/entity/AddUser.class
	build/classes/com/lvg/entity/LoginModule.class
	build/classes/com/lvg/login/CertPicture.class