forked from CMU-17313Q/cmu-17313q-f24-nodebb-f24-NodeBB
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed conflicts with merging feature branch with syntax squads main b…
…ranch
- Loading branch information
Showing
1 changed file
with
3 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,13 +10,16 @@ NodeBB by itself contains a "common core" of basic functionality, while addition | |
|
|
||
| ### [Try it now](//try.nodebb.org) | [Documentation](//docs.nodebb.org) | ||
|
|
||
| <<<<<<< HEAD | ||
| ### Team Members | ||
| + Abdallah Almana [email protected] | ||
| + Abdulwahab Al-Rumaihi [email protected] | ||
| + Hiba Hamad [email protected] | ||
| + Najoud Al-Talib [email protected] | ||
| + Reem Kensouh [email protected] | ||
|
|
||
| ======= | ||
| >>>>>>> individual-fork/f24 | ||
| ## Screenshots | ||
|
|
||
| NodeBB's theming engine is highly flexible and does not restrict your design choices. Check out some themed installs in these screenshots below: | ||
|
|
||