Skip to content

Commit 2d2c5c3

Browse files
Fix git conflict
1 parent 6443cdb commit 2d2c5c3

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

source/faq/fundamentals.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ and perform the following operation:
7575
:method:`db.collection.createIndex()` method or
7676
:method:`db.collection.insertOne()` method would have created
7777
the ``myNewDb`` database automatically.
78-
<<<<<<< HEAD
7978

8079
You can also create a collection explicitly using
8180
:method:`db.createCollection` method if you want to specify specific
@@ -86,18 +85,6 @@ or document validation rules:
8685

8786
use myNewDB;
8887

89-
=======
90-
91-
You can also create a collection explicitly using
92-
:method:`db.createCollection` method if you want to specify specific
93-
:ref:`options<create_collection_parameters>`, such as maximum size
94-
or document validation rules:
95-
96-
.. code-block:: javascript
97-
98-
use myNewDB;
99-
100-
>>>>>>> 275b25d49 (DOCSP-14047 add note about mongoshell to page)
10188
db.createCollection("myNewCollection1");
10289

10390
.. _faq-schema-free:

0 commit comments

Comments
 (0)