This wiki has been migrated to https://gitlab.com/wireshark/wireshark/-/wikis/home and is now deprecated. Please use that site instead.
Differences between revisions 253 and 254
Revision 253 as of 2016-01-05 08:16:13
Size: 622126
Editor: ryangalon
Comment:
Revision 254 as of 2016-01-05 08:17:22
Size: 633447
Editor: MariaJimenez
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
---- /!\ '''Edit conflict - other version:''' ----
Line 12: Line 13:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 29: Line 34:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 37: Line 38:



















---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 69: Line 42:
---- /!\ '''Edit conflict - your version:''' ----

Wiki - A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server.

Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
 Wiki is a website which allows collaborative modification of its content and structure directly from the web browser.
Wiki is a website which allows collaborative modification of its content and structure directly from the web browser.
Line 88: Line 48:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 112: Line 51:

Line 116: Line 53:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Art Gerald Ranque
Blog: a shared online journal where people can post diary entries about their personal experiences and hobbies.
Wiki: a collaborative website which can be directly edited merely using a web browser, often by anyone with access to it.


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
-A regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.
(Laurence Guevarra)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki-A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server. Wikis end up being created mainly by a collaborative effort of the site visitors. A great example of a large wiki is the Wikipedia, a free encyclopedia in many languages that anyone can edit.

Blog - Short for "Web Log," this term refers to a list of journal entries posted on a Web page. Anybody who knows how to create and publish a Web page can publish their own blog. Some Web hosts have made it even easier by creating an interface where users can simply type a text entry and hit "publish" to publish their blog.


Bayaras, Christian Loisse G.

---- /!\ '''Edit conflict - other version:''' ----
Wiki-A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server. Wikis end up being created mainly by a collaborative effort of the site visitors. A great example of a large wiki is the Wikipedia, a free encyclopedia in many languages that anyone can edit.

Blog - Short for "Web Log," this term refers to a list of journal entries posted on a Web page. Anybody who knows how to create and publish a Web page can publish their own blog. Some Web hosts have made it even easier by creating an interface where users can simply type a text entry and hit "publish" to publish their blog.


Bayaras, Christian Loisse G.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Line 187: Line 59:
~Ciedelle Kaye Liong


---- /!\ '''Edit conflict - other version:''' ----
=
====Jeremie S. Escalera - Lab 6 in CS 27-A =====
====Jeremie S. Escalera - Lab 6 in CS 27-A =====
Line 197: Line 65:
---- /!\ '''Edit conflict - your version:''' ----
Blog - a Web site on which someone writes about personal opinions, activities, and experiences
Wiki - a Web site that allows visitors to make changes, contributions, or corrections
~Ciedelle Kaye Liong

A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan

Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Art Gerald Ranque
Wiki
A collaborative website which can be directly edited merely using a web browser, often by anyone with access to it.
Blog
A shared online journal where people can post diary entries about their personal experiences and hobbies.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA




---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA





---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero


---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


---- /!\ '''End of edit conflict''' ----
Lovella June D. Gonzaga


---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


---- /!\ '''End of edit conflict''' ----
Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero


---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA




---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

---- /!\ '''End of edit conflict''' ----




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA




---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Seems editing this page is not peeing in the pool, so I try to ask here because I did't find the right place to ask questions:

Is there a repository/collection/library of [[Lua]] scripts beyond [[Lua/Examples]] to learn from ? Specifically, it seems os.clock() has only timer tick resolution (15 ms on windows and 10 ms on linux), but I need sub-millisecond precision.

Background: I'm willing to write a Lua script to accumulate the timestamps of tens of thousands of sniffed packets and to account wall clock time to my client application once a packet is received on the client pc and to account wall clock time to the network or the other end of the socket (the server) once a packet is sent and do it vice versa on the server pc to get an exact measure of client, network and server times for a performance analysis, but don't know where to start from.

Perhaps someone can point me to the right place to search or to the right method to use ? Thanks, Juergen.

It's not peeing in the pool, but it's also not the best place to ask, as not everybody will see it, and, if somebody sees it and replies, you won't necessarily get notified of it.

The End<<Anchor(TheEnd)>>(well, not quite ;-) ) (cue the song from Apocalypse Now)

You could ask that question on, for example, http://ask.wireshark.org/ or on [[http://www.wireshark.org/lists/|the wireshark-dev mailing list]], but as it's really a Lua question, it might be better to ask on [[http://www.lua.org/lua-l.html|the lua-l mailing list]] or on http://stackoverflow.com (I don't know of any Lua-specific Q&A site).

However, [[http://www.lua.org/manual/5.1/manual.html#pdf-os.clock|the Lua 5.1 manual item on os.clock()]] seems to indicate that it's not what you want - it says it "returns an approximation of the amount in seconds of CPU time used by the program", but it sounds as if you want ''real'' time, not ''CPU'' time. I don't know whether [[http://www.lua.org/manual/5.1/manual.html#pdf-os.time|os.time()]] returns a value with a fractional part, or what the resolution is, but, if the OS call atop which os.time() is implemented - probably [[http://pubs.opengroup.org/onlinepubs/009604599/functions/gettimeofday.html|gettimeofday]]() or something such as that on most if not all UN*Xes - returns a higher-precision time value, that might give you what you want.

This is just a simple text edit, as practice. Thanks.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

Wiki - A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server.

Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
1. Wiki (sometimes spelled "Wiki") is a server program that allows users to collaborate in forming the content of a Web site. The term comes from the word "wikiwiki," which means "fast" in the Hawaiian language.
2. A blog is a frequently updated online personal journal or diary. It is a place to express yourself to the world. A place to share your thoughts and your passions. Really, it’s anything you want it to be. For our purposes we’ll say that a blog is your own website that you are going to update on an ongoing basis. Blog is a short form for the word weblog and the two words are used interchangeably.
-Mark Gambito



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
--------------------------------
'''Wiki''' - Wikis are web pages that groups of people can edit and view together. Whereas a blog is more of an individual, personal journal, a wiki is a group creation. Like blogs, wikis can be created in stages, and by anyone, without the sponsorship of a major commercial enterprise. Private organizations and individuals can also build their own wikis to capture collected knowledge on a particular subject. Many businesses use wikis as their internal collaboration tool. With the global Internet, people of all walks of life can participate in wikis and add their own perspectives and knowledge to a shared resource.

'''Blog''' - Weblogs (Blogs) are web pages that are easy to update and edit. Unlike commercial websites, which are created by professional communications experts, blogs give anyone a means to communicate their thoughts to a global audience without technical knowledge of web design. There are blogs on nearly every topic one can think of, and communities of people often form around popular blog authors.

-JD Belderol
--------------------------------


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 205: Line 4479:
Blog - a Web site on which someone writes about personal opinions, activities, and experiences
Wiki - a Web site that allows visitors to make changes, contributions, or corrections
~Ciedelle Kaye Liong


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

Blog - a Web site on which someone writes about personal opinions, activities, and experiences
Wiki - a Web site that allows visitors to make changes, contributions, or corrections
~Ciedelle Kaye Liong





---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

Blog - a Web site on which someone writes about personal opinions, activities, and experiences
Wiki - a Web site that allows visitors to make changes, contributions, or corrections
~Ciedelle Kaye Liong




---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Art Gerald Ranque
Wiki
A collaborative website which can be directly edited merely using a web browser, often by anyone with access to it.
Blog
A shared online journal where people can post diary entries about their personal experiences and hobbies.

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
(Earl Rudinas)


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser.
Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience.
-Angelo Karlo B. Tan

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero


---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Art Gerald Ranque
Wiki
A collaborative website which can be directly edited merely using a web browser, often by anyone with access to it.
Blog
A shared online journal where people can post diary entries about their personal experiences and hobbies.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA




---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA





---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero


---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
1. A '''wiki''' is a website that allows collaborative editing of its content and structure by its users.
2. A '''blog''' regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


---- /!\ '''End of edit conflict''' ----
Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero


---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA




---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA




---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Seems editing this page is not peeing in the pool, so I try to ask here because I did't find the right place to ask questions:

Is there a repository/collection/library of [[Lua]] scripts beyond [[Lua/Examples]] to learn from ? Specifically, it seems os.clock() has only timer tick resolution (15 ms on windows and 10 ms on linux), but I need sub-millisecond precision.

Background: I'm willing to write a Lua script to accumulate the timestamps of tens of thousands of sniffed packets and to account wall clock time to my client application once a packet is received on the client pc and to account wall clock time to the network or the other end of the socket (the server) once a packet is sent and do it vice versa on the server pc to get an exact measure of client, network and server times for a performance analysis, but don't know where to start from.

Perhaps someone can point me to the right place to search or to the right method to use ? Thanks, Juergen.

It's not peeing in the pool, but it's also not the best place to ask, as not everybody will see it, and, if somebody sees it and replies, you won't necessarily get notified of it.

The End<<Anchor(TheEnd)>>(well, not quite ;-) ) (cue the song from Apocalypse Now)

You could ask that question on, for example, http://ask.wireshark.org/ or on [[http://www.wireshark.org/lists/|the wireshark-dev mailing list]], but as it's really a Lua question, it might be better to ask on [[http://www.lua.org/lua-l.html|the lua-l mailing list]] or on http://stackoverflow.com (I don't know of any Lua-specific Q&A site).

However, [[http://www.lua.org/manual/5.1/manual.html#pdf-os.clock|the Lua 5.1 manual item on os.clock()]] seems to indicate that it's not what you want - it says it "returns an approximation of the amount in seconds of CPU time used by the program", but it sounds as if you want ''real'' time, not ''CPU'' time. I don't know whether [[http://www.lua.org/manual/5.1/manual.html#pdf-os.time|os.time()]] returns a value with a fractional part, or what the resolution is, but, if the OS call atop which os.time() is implemented - probably [[http://pubs.opengroup.org/onlinepubs/009604599/functions/gettimeofday.html|gettimeofday]]() or something such as that on most if not all UN*Xes - returns a higher-precision time value, that might give you what you want.

This is just a simple text edit, as practice. Thanks.

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

Wiki - A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server.

Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
1. Wiki (sometimes spelled "Wiki") is a server program that allows users to collaborate in forming the content of a Web site. The term comes from the word "wikiwiki," which means "fast" in the Hawaiian language.
2. A blog is a frequently updated online personal journal or diary. It is a place to express yourself to the world. A place to share your thoughts and your passions. Really, it’s anything you want it to be. For our purposes we’ll say that a blog is your own website that you are going to update on an ongoing basis. Blog is a short form for the word weblog and the two words are used interchangeably.
-Mark Gambito



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
--------------------------------
'''Wiki''' - Wikis are web pages that groups of people can edit and view together. Whereas a blog is more of an individual, personal journal, a wiki is a group creation. Like blogs, wikis can be created in stages, and by anyone, without the sponsorship of a major commercial enterprise. Private organizations and individuals can also build their own wikis to capture collected knowledge on a particular subject. Many businesses use wikis as their internal collaboration tool. With the global Internet, people of all walks of life can participate in wikis and add their own perspectives and knowledge to a shared resource.

'''Blog''' - Weblogs (Blogs) are web pages that are easy to update and edit. Unlike commercial websites, which are created by professional communications experts, blogs give anyone a means to communicate their thoughts to a global audience without technical knowledge of web design. There are blogs on nearly every topic one can think of, and communities of people often form around popular blog authors.

-JD Belderol
--------------------------------


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki - collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.
by Torralba, Eriko S from Google

---- /!\ '''End of edit conflict''' ----




---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 5152: Line 4572:

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
Wiki - collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.
by Torralba, Eriko S from Google

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
A website that allows collaborative editing of its content and structure by its users.Term comes from the Hawaiian term "wikiwiki" which means "fast.
Definition of blog
-A regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.
(Laurence Guevarra)
Line 5249: Line 4582:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5280: Line 4623:
---- /!\ '''End of edit conflict''' ----
Line 5327: Line 4672:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
Line 5343: Line 4694:

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 5486: Line 4843:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 5602: Line 4965:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 5635: Line 5008:


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5674: Line 5053:
---- /!\ '''End of edit conflict''' ----
Line 5708: Line 5089:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 5785: Line 5172:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5800: Line 5191:
---- /!\ '''End of edit conflict''' ----
Line 5827: Line 5220:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 5872: Line 5271:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5874: Line 5277:

---- /!\ '''End of edit conflict''' ----
Line 5929: Line 5334:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 5992: Line 5415:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5996: Line 5423:

---- /!\ '''End of edit conflict''' ----
Line 6008: Line 5437:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 6052: Line 5487:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 6062: Line 5501:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 6124: Line 5583:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 6179: Line 5650:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Line 6200: Line 5681:

---- /!\ '''End of edit conflict''' ----
Line 6327: Line 5810:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 6363: Line 5852:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 6527: Line 6022:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 6608: Line 6115:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 6620: Line 6131:

---- /!\ '''End of edit conflict''' ----
Line 6815: Line 6328:
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 6931: Line 6450:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 6968: Line 6493:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 6998: Line 6529:
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 7013: Line 6550:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 7027: Line 6568:
---- /!\ '''End of edit conflict''' ----
Line 7109: Line 6652:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''E
dit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 7168: Line 6723:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 7184: Line 6749:

---- /!\ '''End of edit conflict''' ----
Line 7259: Line 6826:
---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 7286: Line 6859:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 7299: Line 6876:


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 7319: Line 6902:

---- /!\ '''End of edit conflict''' ----
Line 7371: Line 6956:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 7443: Line 7056:

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 7575: Line 7196:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 7626: Line 7259:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict
''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:
''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 7774: Line 7419:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 7790: Line 7445:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 7862: Line 7523:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 7964: Line 7633:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 8148: Line 7829:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 8292: Line 7979:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 8299: Line 7990:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 8478: Line 8177:
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 8501: Line 8210:

---- /!\ '''End of edit conflict''' ----
Line 8539: Line 8250:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 8544: Line 8259:

---- /!\ '''End of edit conflict''' ----
Line 8589: Line 8306:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 8681: Line 8404:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict
''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 8729: Line 8480:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 8876: Line 8647:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 8923: Line 8700:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 8985: Line 8774:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 9040: Line 8851:

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 9138: Line 8957:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 9275: Line 9100:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 9287: Line 9116:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 9325: Line 9160:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 9416: Line 9259:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 9554: Line 9403:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
Line 9634: Line 9489:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 9638: Line 9497:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 9747: Line 9614:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 9760: Line 9637:

---- /!\ '''End of edit conflict''' ----
Line 9811: Line 9690:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 9947: Line 9832:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 9949: Line 9838:

---- /!\ '''End of edit conflict''' ----
Line 10056: Line 9947:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 10073: Line 9970:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict -
other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 10134: Line 10049:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 10181: Line 10102:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 10331: Line 10258:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 10395: Line 10352:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 10443: Line 10406:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 10449: Line 10416:

---- /!\ '''End of edit conflict''' ----
Line 10545: Line 10514:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 10598: Line 10573:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 10663: Line 10648:

---- /!\ '''End of edit conflict''' ----
Line 10667: Line 10654:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 10699: Line 10704:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 10758: Line 10769:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 10765: Line 10780:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
Line 10850: Line 10885:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 10923: Line 10976:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 10997: Line 11062:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 11002: Line 11071:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 11074: Line 11151:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 11256: Line 11339:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 11299: Line 11388:

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Line 11389: Line 11484:
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 11482: Line 11589:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 11495: Line 11606:

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 11502: Line 11619:

---- /!\ '''End of edit conflict''' ----
Line 11536: Line 11655:
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 11574: Line 11705:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 11660: Line 11803:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 11713: Line 11862:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 11776: Line 11931:
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 11955: Line 12116:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 11961: Line 12126:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 11978: Line 12149:


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 12055: Line 12246:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 12128: Line 12325:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
Line 12146: Line 12349:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 12216: Line 12425:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 12242: Line 12457:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 12274: Line 12495:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 12314: Line 12541:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 12380: Line 12613:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 12478: Line 12717:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 12502: Line 12747:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 12514: Line 12763:

---- /!\ '''End of edit conflict''' ----
Line 12547: Line 12798:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 12565: Line 12820:
---- /!\ '''End of edit conflict''' ----
Line 12592: Line 12849:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 12752: Line 13015:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 12781: Line 13050:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 12789: Line 13062:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 12872: Line 13153:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 12930: Line 13217:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 12945: Line 13238:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 12958: Line 13255:
---- /!\ '''End of edit conflict''' ----
Line 13003: Line 13302:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 13008: Line 13311:

---- /!\ '''End of edit conflict''' ----
Line 13035: Line 13340:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:
''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 13047: Line 13362:

---- /!\ '''End of edit conflict''' ----
Line 13118: Line 13435:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 13131: Line 13452:
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 13159: Line 13488:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 13215: Line 13556:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 13270: Line 13617:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 13303: Line 13656:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 13324: Line 13693:

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 13436: Line 13813:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 13542: Line 13937:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 13550: Line 13949:

---- /!\ '''End of edit conflict''' ----
Line 13622: Line 14023:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 13647: Line 14054:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 13674: Line 14087:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 13736: Line 14161:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 13790: Line 14221:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 13798: Line 14233:

---- /!\ '''End of edit conflict''' ----
Line 14081: Line 14518:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 14121: Line 14564:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict
''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:
''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 14228: Line 14689:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 14304: Line 14777:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 14363: Line 14842:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 14398: Line 14883:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 14560: Line 15057:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 14564: Line 15065:

---- /!\ '''End of edit conflict''' ----
Line 14587: Line 15090:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 14611: Line 15120:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 14685: Line 15212:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 14808: Line 15341:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 14830: Line 15367:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 14913: Line 15468:

---- /!\ '''End of edit conflict''' ----
Line 14929: Line 15486:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 15012: Line 15581:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 15066: Line 15641:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 15397: Line 15978:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 15442: Line 16029:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 15481: Line 16080:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''E
nd of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 15515: Line 16130:

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 15554: Line 16177:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 15569: Line 16198:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 15578: Line 16213:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 15633: Line 16274:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 15640: Line 16285:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 15650: Line 16301:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 15706: Line 16365:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 15711: Line 16374:

---- /!\ '''End of edit conflict''' ----
Line 15803: Line 16468:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 15953: Line 16624:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 15998: Line 16675:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 16149: Line 16832:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 16171: Line 16860:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----




---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----




---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 16197: Line 16912:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 16208: Line 17155:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 16239: Line 17234:
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 16354: Line 17280:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 16365: Line 17287:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 16373: Line 17293:
Lovella June D. Gonzaga



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 16424: Line 17429:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Line 16458: Line 17497:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.
Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites
-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 16531: Line 17559:

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 16544: Line 17566:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - other version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Line 16668: Line 17727:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Line 16689: Line 17732:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
Line 16783: Line 17767:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 16787: Line 17794:
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Line 16803: Line 17831:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict -
your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 16863: Line 17980:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
Created an account for this wiki sandbox
Practice...

Done with main edit, want to do links within ProtocolReferencePage, so I'll link to the end of [[https://wiki.wireshark.org/WikiSandBox#TheEnd|WikiSandBox#TheEnd]] [[#TheEnd|The End]]

The above is disposable practice after Today, Saturday, 2015-03-15, as is the anchor and the line it is on. I hope you like the results on [[ProtocolReferencePage]].

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

Seems editing this page is not peeing in the pool, so I try to ask here because I did't find the right place to ask questions:

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


Seems editing this page is not peeing in the pool, so I try to ask here because I did't find the right place to ask questions:

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 16945: Line 18610:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 17057: Line 18728:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 17221: Line 18904:
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 17250: Line 18945:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
Line 17352: Line 19025:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 17457: Line 19066:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)


---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----



---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Definition of wiki
-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."
Definition of blog
-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users
Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga




---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
Created an account for this wiki sandbox
Practice...

Done with main edit, want to do links within ProtocolReferencePage, so I'll link to the end of [[https://wiki.wireshark.org/WikiSandBox#TheEnd|WikiSandBox#TheEnd]] [[#TheEnd|The End]]

The above is disposable practice after Today, Saturday, 2015-03-15, as is the anchor and the line it is on. I hope you like the results on [[ProtocolReferencePage]].

---- /!\ '''End of edit conflict''' ----

Seems editing this page is not peeing in the pool, so I try to ask here because I did't find the right place to ask questions:

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


Seems editing this page is not peeing in the pool, so I try to ask here because I did't find the right place to ask questions:

---- /!\ '''End of edit conflict''' ----


/!\ Edit conflict - other version:


A blog (a truncation of the expression weblog)[1] is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (the most recent post appears first). Until 2009, blogs were usually the work of a single individual[citation needed], occasionally of a small group, and often covered a single subject. More recently "multi-author blogs" (MABs) have developed, with posts written by large numbers of authors and professionally edited. - Ildefonso Esguerra

A wiki is run using wiki software, otherwise known as a wiki engine. There are dozens of different wiki engines in use, both standalone and part of other software, such as bug tracking systems. Some wiki engines are open source, whereas others are proprietary. Some permit control over different functions (levels of access); for example, editing rights may permit changing, adding or removing material. Others may permit access without enforcing access control. Other rules may also be imposed to organize content. A wiki engine is a type of content management system, but it differs from most other such systems, including blog software, in that the content is created without any defined owner or leader, and wikis have little implicit structure, allowing structure to emerge according to the needs of the users - Ildefonso Esguerra

Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. In a typical wiki, text is written using a simplified markup language (known as "wiki markup"), and often edited with the help of a rich-text editor.A wiki is run using wiki software, otherwise known as a wiki engine. There are dozens of different wiki engines in use, both standalone and part of other software, such as bug tracking systems. Some wiki engines are open source, whereas others are proprietary. Some permit control over different functions (levels of access); for example, editing rights may permit changing, adding or removing material. Others may permit access without enforcing access control. Other rules may also be imposed to organize content. A wiki engine is a type of content management system, but it differs from most other such systems, including blog software, in that the content is created without any defined owner or leader, and wikis have little implicit structure, allowing structure to emerge according to the needs of the users. - Ryan Galon

Blog - A blog (a truncation of the expression weblog)[1] is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (the most recent post appears first). Until 2009, blogs were usually the work of a single individual[citation needed], occasionally of a small group, and often covered a single subject. More recently "multi-author blogs" (MABs) have developed, with posts written by large numbers of authors and professionally edited. MABs from newspapers, other media outlets, universities, think tanks, advocacy groups, and similar institutions account for an increasing quantity of blog traffic. The rise of Twitter and other "microblogging" systems helps integrate MABs and single-author blogs into societal newstreams. Blog can also be used as a verb, meaning to maintain or add content to a blog. – Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict


WIKI: a website that allows anyone to add, delete, or revise content by using a web browser. BLOG: a website that maintains frequently updated and ongoing entries or posts. CLINT SABUERO

wiki - a website that allows visitors to make changes, contributions, or corrections.

blog - a website on which someone writes about personal opinions and experiences

Juliefer D. Mansueto


/!\ Edit conflict - other version:


Wiki - A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server.

Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa

BLOG (a truncation of the expression weblog) is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (the most recent post appears first). - RAJ GECOSALA

WIKI (Listeni/ˈwɪki/ wik-ee) is a website which allows collaborative modification of its content and structure directly from the web browser. In a typical wiki, text is written using a simplified markup language (known as "wiki markup"), and often edited with the help of a rich-text editor. - RAJ GECOSALA

Art Gerald Ranque Blog: a shared online journal where people can post diary entries about their personal experiences and hobbies. Wiki: a collaborative website which can be directly edited merely using a web browser, often by anyone with access to it.

Wiki is a website which allows collaborative modification of its content and structure directly from the web browser. Definition of wiki is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (John Edgar Otom) Definition of blog

Wiki-A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server. Wikis end up being created mainly by a collaborative effort of the site visitors. A great example of a large wiki is the Wikipedia, a free encyclopedia in many languages that anyone can edit.

Blog - Short for "Web Log," this term refers to a list of journal entries posted on a Web page. Anybody who knows how to create and publish a Web page can publish their own blog. Some Web hosts have made it even easier by creating an interface where users can simply type a text entry and hit "publish" to publish their blog. Bayaras, Christian Loisse G.

Definition of wiki A website that allows collaborative editing of its content and structure by its users.Term comes from the Hawaiian term "wikiwiki" which means "fast. Definition of blog -A regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. (Laurence Guevarra)

====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

Blog - a Web site on which someone writes about personal opinions, activities, and experiences Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong

A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser. Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience. -Angelo Karlo B. Tan

Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)

Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ End of edit conflict


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Art Gerald Ranque Wiki A collaborative website which can be directly edited merely using a web browser, often by anyone with access to it. Blog A shared online journal where people can post diary entries about their personal experiences and hobbies.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ End of edit conflict


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict