Resolve conflicts after import.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88994 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/.cvsignore b/modules/ssl/.cvsignore
index 65f0cc30cf67bc6f96345894a900f5d81e766466..239bc29765bf5e5319dfb0f5d924c95531d3ef9f 100644 (file)
--- a/modules/ssl/.cvsignore
+++ b/modules/ssl/.cvsignore
@@ -1,10 +1,6 @@
-.deps
 .libs
-*.la
-modules.mk
+.deps
 Makefile
+modules.mk
 *.lo
-*.slo
-*.so
-Debug
-Release
+*.la

diff --git a/modules/ssl/.indent.pro b/modules/ssl/.indent.pro
deleted file mode 100644 (file)
index a9fbe9f..0000000
--- a/modules/ssl/.indent.pro
+++ /dev/null
@@ -1,54 +0,0 @@
--i4 -npsl -di0 -br -nce -d0 -cli0 -npcs -nfc1
--TBUFF
--TFILE
--TTRANS
--TUINT4
--T_trans
--Tallow_options_t
--Tapache_sfio
--Tarray_header
--Tbool_int
--Tbuf_area
--Tbuff_struct
--Tbuffy
--Tcmd_how
--Tcmd_parms
--Tcommand_rec
--Tcommand_struct
--Tconn_rec
--Tcore_dir_config
--Tcore_server_config
--Tdir_maker_func
--Tevent
--Tglobals_s
--Thandler_func
--Thandler_rec
--Tjoblist_s
--Tlisten_rec
--Tmerger_func
--Tmode_t
--Tmodule
--Tmodule_struct
--Tmutex
--Tn_long
--Tother_child_rec
--Toverrides_t
--Tparent_score
--Tpid_t
--Tpiped_log
--Tpool
--Trequest_rec
--Trequire_line
--Trlim_t
--Tscoreboard
--Tsemaphore
--Tserver_addr_rec
--Tserver_rec
--Tserver_rec_chain
--Tshort_score
--Ttable
--Ttable_entry
--Tthread
--Tu_wide_int
--Tvtime_t
--Twide_int